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

Remove tabs

This commit is contained in:
Eelco Dolstra 2013-11-26 11:01:53 +01:00
parent 0c69649a55
commit a652895cc9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/glibc/2.18/builder.sh
View File

@ -19,7 +19,7 @@ postInstall() {
if test -n "$installLocales"; then if test -n "$installLocales"; then
make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} 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
# FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been
@ -27,19 +27,19 @@ postInstall() {
if test -z "$hurdHeaders"; then if test -z "$hurdHeaders"; then
# Include the Linux kernel headers in Glibc, except the `scsi' # Include the Linux kernel headers in Glibc, except the `scsi'
# subdirectory, which Glibc provides itself. # subdirectory, which Glibc provides itself.
(cd $out/include && \ (cd $out/include && \
ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
fi fi
if test -f "$out/lib/libhurduser.so"; then if test -f "$out/lib/libhurduser.so"; then
# libc.so, libhurduser.so, and libmachuser.so depend on each # libc.so, libhurduser.so, and libmachuser.so depend on each
# other, so add them to libc.so (a RUNPATH on libc.so.0.3 # other, so add them to libc.so (a RUNPATH on libc.so.0.3
# would be ignored by the cross-linker.) # would be ignored by the cross-linker.)
echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..."
sed -i "$out/lib/libc.so" \ sed -i "$out/lib/libc.so" \
-e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g"
fi fi
# 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".
if test -n "$is64bit"; then if test -n "$is64bit"; then