summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2007-10-21 13:48:34 +0200
committerArwed von Merkatz2007-10-21 13:48:34 +0200
commitc3767a2552c46b5a99ca1b96e6a95c932372d298 (patch)
treee50514c0794e5578c6e712fcc6dd2eb295c97bad
parent6447d0ca1163e51305ecc1a533dcefddb13ec87d (diff)
glibc: remove /usr/include/{asm,asm-generic,linux} symlinks on install
-rw-r--r--libs/glibc/HISTORY5
-rwxr-xr-xlibs/glibc/PRE_INSTALL11
2 files changed, 16 insertions, 0 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 76e2b8ab82..c1061ce707 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2007-10-21 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * PRE_INSTALL: remove each of /usr/include/{asm,asm-generic,linux} if
+ it is a symlink, seems like some installations still have those,
+ which breaks stuff
+
2007-10-18 David Brown <dmlb2000@gmail.com>
* DETAILS: updated header version to 2.6.23.1
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index 4cda51574d..cadcee1271 100755
--- a/libs/glibc/PRE_INSTALL
+++ b/libs/glibc/PRE_INSTALL
@@ -26,4 +26,15 @@ 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