BDW-GC, GMP, libffi, libunistring, Readline: Don't use the native `strip'.

Using the native `strip' breaks static libraries when cross-compiling.

svn path=/nixpkgs/trunk/; revision=27572
This commit is contained in:
Ludovic Courtès 2011-07-01 13:20:12 +00:00
parent 3a8af0ddf7
commit 7762934904
5 changed files with 40 additions and 5 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
name = "boehm-gc-7.2pre20110122"; name = "boehm-gc-7.2pre20110122";
src = fetchurl { src = fetchurl {
@ -41,3 +41,10 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }
//
# Don't run the native `strip' when cross-compiling.
(if (stdenv ? cross)
then { dontStrip = true; }
else { }))

View File

@ -4,7 +4,7 @@ let
staticFlags = if static then " --enable-static --disable-shared" else ""; staticFlags = if static then " --enable-static --disable-shared" else "";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
name = "gmp-4.3.2"; name = "gmp-4.3.2";
src = fetchurl { src = fetchurl {
@ -64,3 +64,10 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }
//
# Don't run the native `strip' when cross-compiling.
(if (stdenv ? cross)
then { dontStrip = true; }
else { }))

View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv }: { fetchurl, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
name = "libffi-3.0.9"; name = "libffi-3.0.9";
src = fetchurl { src = fetchurl {
@ -42,3 +42,10 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }
//
# Don't run the native `strip' when cross-compiling.
(if (stdenv ? cross)
then { dontStrip = true; }
else { }))

View File

@ -55,4 +55,11 @@ stdenv.mkDerivation (rec {
# can't find the dll, it will only create a static library. # can't find the dll, it will only create a static library.
(if (stdenv ? glibc) (if (stdenv ? glibc)
then {} then {}
else { configureFlags = "--with-libiconv-prefix=${libiconv}"; })) else { configureFlags = "--with-libiconv-prefix=${libiconv}"; })
//
# Don't run the native `strip' when cross-compiling.
(if (stdenv ? cross)
then { dontStrip = true; }
else { }))

View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, ncurses }: { fetchurl, stdenv, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
name = "readline-6.1"; name = "readline-6.1";
src = fetchurl { src = fetchurl {
@ -48,3 +48,10 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
}; };
} }
//
# Don't run the native `strip' when cross-compiling.
(if (stdenv ? cross)
then { dontStrip = true; }
else { }))