[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (c3767a2552c46b5a99ca1b96e6a95c932372d298)

Arwed von Merkatz scm at sourcemage.org
Sun Oct 21 07:48:44 EDT 2007


GIT changes to master grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 libs/glibc/HISTORY     |    5 +++++
 libs/glibc/PRE_INSTALL |   11 +++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit c3767a2552c46b5a99ca1b96e6a95c932372d298
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    glibc: remove /usr/include/{asm,asm-generic,linux} symlinks on install

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 76e2b8a..c1061ce 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2007-10-21 Arwed v. Merkatz <v.merkatz at 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 at gmail.com>
 	* DETAILS: updated header version to 2.6.23.1
 
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index 4cda515..cadcee1 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



More information about the SM-Commit mailing list