public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* The Linux 2.6.32 headers contain a "scsi" subdirectory, which 

clashes with Glibc's "scsi" subdirectory.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19553
This commit is contained in:
Eelco Dolstra 2010-01-19 18:28:48 +00:00
parent 93b250b960
commit f93620419f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/glibc-2.11/builder.sh
View File

@ -19,8 +19,12 @@ postInstall() {
if test -n "$installLocales"; then if test -n "$installLocales"; then
make localedata/install-locales make localedata/install-locales
fi fi
test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
(cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1
# Include the Linux kernel headers in Glibc, except the `scsi'
# subdirectory, which Glibc provides itself.
(cd $out/include && ln -s $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
# Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink
# "lib64" to "lib". # "lib64" to "lib".