diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-11 11:58:49 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-11 11:58:49 +0100 |
commit | 2af1cb3aa673102491ffd8cfdeca8ae2dec154b5 (patch) | |
tree | 4906c8441c7715a69f3ea17b883d5d19b8111021 /pkgs/development/libraries | |
parent | fabbd0f0f7fdb536f56d73487aec198c24163fd0 (diff) | |
parent | a11a28107120612c0284a19d41b6ffb5750a65ac (diff) | |
download | nixpkgs-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar nixpkgs-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.gz nixpkgs-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.bz2 nixpkgs-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.lz nixpkgs-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.xz nixpkgs-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.zst nixpkgs-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.zip |
Merge remote-tracking branch 'origin/binutils-2.26' into staging
This still breaks a few packages, but nothing really major: http://hydra.nixos.org/eval/1241850?filter=x86_64-linux&compare=1237919&full=#tabs-now-fail
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/glibc/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/librdf/redland.nix | 3 |
3 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh index d0684d6194d..d60b143a1ec 100644 --- a/pkgs/development/libraries/glibc/builder.sh +++ b/pkgs/development/libraries/glibc/builder.sh @@ -37,6 +37,10 @@ postInstall() { # Get rid of more unnecessary stuff. rm -rf $out/var $out/sbin/sln + + for i in $out/lib/*.a; do + strip -S "$i" + done } genericBuild diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 5e25c2dc8bc..2630cdb127f 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -2,7 +2,6 @@ , installLocales ? true , profilingLibraries ? false , gccCross ? null -, debugSymbols ? false , withGd ? false, gd ? null, libpng ? null }: @@ -13,9 +12,7 @@ let cross = if gccCross != null then gccCross.target else null; in build cross ({ - name = "glibc" - + lib.optionalString debugSymbols "-debug" - + lib.optionalString withGd "-gd"; + name = "glibc" + lib.optionalString withGd "-gd"; inherit lib stdenv fetchurl linuxHeaders installLocales profilingLibraries gccCross withGd gd libpng; @@ -38,23 +35,13 @@ in fi ''; + separateDebugInfo = true; + meta.description = "The GNU C Library"; } // - (if debugSymbols - then { - # Build with debugging symbols, but leave optimizations on and don't - # attempt to keep the build tree. - dontStrip = true; - dontCrossStrip = true; - NIX_STRIP_DEBUG = 0; - } - else {}) - - // - (if cross != null then { preConfigure = '' diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 8ef90049345..34eabfe6473 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation rec { [ "--with-threads" ] ++ stdenv.lib.optional withBdb "--with-bdb=${db}"; + # Fix broken DT_NEEDED in lib/redland/librdf_storage_sqlite.so. + NIX_CFLAGS_LINK = "-lraptor2"; + meta = { homepage = http://librdf.org/; }; |