diff options
| author | Arwed von Merkatz | 2007-10-21 13:48:34 +0200 |
|---|---|---|
| committer | David Brown | 2007-10-30 04:10:53 +0000 |
| commit | 0833a50c14ea9aa982b1c69a62c915c67a47732c (patch) | |
| tree | 7f33aa543d302eba9829e6c39e2396ddc3286580 | |
| parent | 90d95cd8b597e3e0dd85d24116aebfd9daa24e61 (diff) | |
glibc: remove /usr/include/{asm,asm-generic,linux} symlinks on install
| -rw-r--r-- | libs/glibc/HISTORY | 5 | ||||
| -rwxr-xr-x | libs/glibc/PRE_INSTALL | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 2f601a9ecd..9659ad2a0f 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 |