summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2012-02-09 20:12:58 +0100
committerTreeve Jelbert2012-02-09 20:12:58 +0100
commitdcfee508e1d4f87b09d00866042387a7e23cb6c5 (patch)
tree8e9bc7687c69e14faf3c8addefba3a714afd876c
parent07364069951832d98f6c1957f268f13486b56380 (diff)
glibc - remove obsolete fixups
-rwxr-xr-xlibs/glibc/BUILD12
-rw-r--r--libs/glibc/HISTORY1
-rwxr-xr-xlibs/glibc/PRE_INSTALL11
-rwxr-xr-xlibs/glibc/UP_TRIGGERS3
4 files changed, 1 insertions, 26 deletions
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 9adf5455ac..20d1d0f320 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -1,5 +1,3 @@
-make_single &&
-
# install x86_64 linker to lib instead of lib64
sedit "s/lib64/lib/" sysdeps/unix/sysv/linux/x86_64/ldconfig.h &&
sedit "s/264/2/" sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed &&
@@ -12,16 +10,6 @@ sedit "s/| x86_64//" sysdeps/unix/sysv/linux/configure &&
sedit "s/| x86_64//" sysdeps/unix/sysv/linux/configure.in
fi &&
-#
-# bug#5570 ccache sometimes has trouble correctly recognising minor differences
-# in configurations and doesn't force recompile when it should. This stops it from
-# using the old cache entries.
-#
-export CCACHE_RECACHE=true &&
-#
-# End ccache fix
-#
-
local ADDONS
ADDONS="nptl" &&
#
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 70ae3345f5..23a9b431db 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,5 +1,6 @@
2012-02-09 Treeve Jelbert <treeve@sourcemage.org>
* *: remove support for linux-2.4
+ * remove obsolete fixups
2011-09-20 Ismael Luceno <ismael@sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index cadcee1271..4cda51574d 100755
--- a/libs/glibc/PRE_INSTALL
+++ b/libs/glibc/PRE_INSTALL
@@ -26,15 +26,4 @@ fi &&
if spell_ok glibc; then
dispel --notriggers --nosustain glibc
-fi &&
-
-# clean up symlinks that break stuff, we used to install those
-if [[ -h $INSTALL_ROOT/usr/include/asm ]]; then
- rm -f $INSTALL_ROOT/usr/include/asm
-fi &&
-if [[ -h $INSTALL_ROOT/usr/include/asm-generic ]]; then
- rm -f $INSTALL_ROOT/usr/include/asm-generic
-fi &&
-if [[ -h $INSTALL_ROOT/usr/include/linux ]]; then
- rm -f $INSTALL_ROOT/usr/include/linux
fi
diff --git a/libs/glibc/UP_TRIGGERS b/libs/glibc/UP_TRIGGERS
index 777066d00e..5894d3f683 100755
--- a/libs/glibc/UP_TRIGGERS
+++ b/libs/glibc/UP_TRIGGERS
@@ -3,6 +3,3 @@ if ! spell_ok locale; then
echo
fi
-if $(gaze from $INSTALL_ROOT/usr/include/drm|grep -q glibc) && spell_ok libdrm; then
- up_trigger libdrm cast_self
-fi