summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2010-09-12 22:23:50 +0200
committerGeorge Sherwood2010-09-25 13:32:26 -0500
commit775e26abed71a29619beda5598cb32b24c1155d5 (patch)
tree80577dde22cafd95649d0ebfabbaa2872a2f43b0
parente86cd2eb681aa25a3749b8d691560dc49a9877f7 (diff)
libs/glibc: fixed build with make 3.82
(cherry picked from commit 528e0008422329e00fc88ea09a20d2c41260835c)
-rw-r--r--libs/glibc/HISTORY3
-rwxr-xr-xlibs/glibc/PRE_BUILD4
2 files changed, 6 insertions, 1 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 8b172d2cd6..762a99d776 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2010-09-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * PRE_BUILD: fixed build with make 3.82
+
2010-08-06 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.12.1, HEADERS_VERSION=2.6.35, gnu.gpg -> glibc.gpg
* PRE_BUILD, binutils-2.20.patch: removed patch
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 5c94952fcf..8d99f5d3fe 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -81,5 +81,7 @@ mk_source_dir $SOURCE_DIRECTORY.bld &&
# fix #11832 - linking in /tmp doesn't work with grsecurity so do it elsewhere
local test_path=$SOURCE_DIRECTORY.bld/test-installation &&
mkdir $test_path &&
-sed -i "s,/tmp,$test_path,g" scripts/test-installation.pl
+sed -i "s,/tmp,$test_path,g" scripts/test-installation.pl &&
+sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile
+