diff options
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/builder.sh | 58 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 57 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/fix_warnings.patch | 36 |
4 files changed, 92 insertions, 60 deletions
diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh deleted file mode 100644 index 85f27c7b3559..000000000000 --- a/pkgs/development/libraries/glibc/builder.sh +++ /dev/null @@ -1,58 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS - - # Apparently --bindir is not respected. - makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") -} - -postInstall() { - if test -n "$installLocales"; then - make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales - fi - - test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache - - if test -n "$linuxHeaders"; then - # Include the Linux kernel headers in Glibc, except the `scsi' - # subdirectory, which Glibc provides itself. - (cd $dev/include && \ - ln -sv $(ls -d $linuxHeaders/include/* | grep -v 'scsi$') .) - fi - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi - - # Get rid of more unnecessary stuff. - rm -rf $out/var $out/sbin/sln - - for i in $out/lib/*.a; do - strip -S "$i" - done - # Put libraries for static linking in a separate output. Note - # that libc_nonshared.a and libpthread_nonshared.a are required - # for dynamically-linked applications. - mkdir -p $static/lib - mv $out/lib/*.a $static/lib - mv $static/lib/lib*_nonshared.a $out/lib - - # Work around a Nix bug: hard links across outputs cause a build failure. - cp $bin/bin/getconf $bin/bin/getconf_ - mv $bin/bin/getconf_ $bin/bin/getconf -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index a189edb9832d..e90fdc4ad7bd 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation ({ ./glob-simplify-interface.patch ./cve-2016-1234.patch ./cve-2016-3706.patch + ./fix_warnings.patch ]; postPatch = diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 80fc2ce1e93d..0ea6b4b938b2 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -17,7 +17,21 @@ in inherit lib stdenv fetchurl linuxHeaders installLocales profilingLibraries gccCross withGd gd libpng; - builder = ./builder.sh; + NIX_NO_SELF_RPATH = true; + + postConfigure = '' + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS + + # Apparently --bindir is not respected. + makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") + ''; # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # any program we run, because the gcc will have been placed at a new @@ -26,7 +40,7 @@ in # Building from a proper gcc staying in the path where it was installed, # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without # any special hack. - preInstall = if cross != null then "" else '' + preInstall = '' if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 @@ -35,6 +49,41 @@ in fi ''; + postInstall = '' + if test -n "$installLocales"; then + make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales + fi + + test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache + + if test -n "$linuxHeaders"; then + # Include the Linux kernel headers in Glibc, except the `scsi' + # subdirectory, which Glibc provides itself. + (cd $dev/include && \ + ln -sv $(ls -d $linuxHeaders/include/* | grep -v scsi\$) .) + fi + + # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink + # "lib64" to "lib". + if test -n "$is64bit"; then + ln -s lib $out/lib64 + fi + + # Get rid of more unnecessary stuff. + rm -rf $out/var $out/sbin/sln + + # Put libraries for static linking in a separate output. Note + # that libc_nonshared.a and libpthread_nonshared.a are required + # for dynamically-linked applications. + mkdir -p $static/lib + mv $out/lib/*.a $static/lib + mv $static/lib/lib*_nonshared.a $out/lib + + # Work around a Nix bug: hard links across outputs cause a build failure. + cp $bin/bin/getconf $bin/bin/getconf_ + mv $bin/bin/getconf_ $bin/bin/getconf + ''; + separateDebugInfo = true; meta.description = "The GNU C Library"; @@ -62,6 +111,10 @@ in dontStrip=1 ''; + preInstall = null; # clobber the native hook + + separateDebugInfo = false; # this is currently broken for crossDrv + # To avoid a dependency on the build system 'bash'. preFixup = '' rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} diff --git a/pkgs/development/libraries/glibc/fix_warnings.patch b/pkgs/development/libraries/glibc/fix_warnings.patch new file mode 100644 index 000000000000..fd75c18c84ec --- /dev/null +++ b/pkgs/development/libraries/glibc/fix_warnings.patch @@ -0,0 +1,36 @@ +--- a/stdlib/setenv.c 2016-05-30 11:09:14.487180254 +0000 ++++ b/stdlib/setenv.c 2016-05-30 11:08:25.560390748 +0000 +@@ -277,6 +277,7 @@ + + ep = __environ; + if (ep != NULL) ++ { + while (*ep != NULL) + if (!strncmp (*ep, name, len) && (*ep)[len] == '=') + { +@@ -290,6 +291,7 @@ + } + else + ++ep; ++ } + + UNLOCK; + +--- a/nis/nis_call.c 2016-05-30 08:05:59.359855696 -0700 ++++ b/nis/nis_call.c 2016-05-30 08:05:55.679873221 -0700 +@@ -680,6 +680,7 @@ + /* Choose which entry should be evicted from the cache. */ + loc = &nis_server_cache[0]; + if (*loc != NULL) ++ { + for (i = 1; i < 16; ++i) + if (nis_server_cache[i] == NULL) + { +@@ -690,6 +691,7 @@ + || ((*loc)->uses == nis_server_cache[i]->uses + && (*loc)->expires > nis_server_cache[i]->expires)) + loc = &nis_server_cache[i]; ++ } + old = *loc; + *loc = new; + |