Merge pull request #11278 from abbradar/gdb-guile

gdb: use system zlib, fix guile support
This commit is contained in:
Nikolay Amiantov 2015-11-27 02:09:13 +03:00
commit 2472e19914

View file

@ -1,6 +1,8 @@
{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
, dejagnu, python, perl, pkgconfig, guile, target ? null
{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo, zlib
, dejagnu, perl, pkgconfig
, python ? null
, guile ? null
, target ? null
# Additional dependencies for GNU/Hurd.
, mig ? null, hurd ? null
@ -30,32 +32,29 @@ stdenv.mkDerivation rec {
sha256 = "1a08c9svaihqmz2mm44il1gwa810gmwkckns8b0y0v3qz52amgby";
};
# I think python is not a native input, but I leave it
# here while I will not need it cross building
nativeBuildInputs = [ texinfo python perl ]
nativeBuildInputs = [ pkgconfig texinfo perl ]
++ stdenv.lib.optional isGNU mig;
buildInputs = [ ncurses readline gmp mpfr expat /* pkgconfig guile */ ]
buildInputs = [ ncurses readline gmp mpfr expat zlib python guile ]
++ stdenv.lib.optional isGNU hurd
++ stdenv.lib.optional doCheck dejagnu;
enableParallelBuilding = true;
configureFlags = with stdenv.lib;
'' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline
--with-expat --with-libexpat-prefix=${expat}
--with-separate-debug-dir=/run/current-system/sw/lib/debug
''
+ optionalString (target != null) " --target=${target.config}"
+ optionalString (elem stdenv.system platforms.cygwin) " --without-python";
[ "--with-gmp=${gmp}" "--with-mpfr=${mpfr}" "--with-system-readline"
"--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat}"
"--with-separate-debug-dir=/run/current-system/sw/lib/debug"
]
++ optional (target != null) "--target=${target.config}"
++ optional (elem stdenv.system platforms.cygwin) "--without-python";
crossAttrs = {
# Do not add --with-python here to avoid cross building it.
configureFlags =
'' --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} --with-system-readline
--with-expat --with-libexpat-prefix=${expat.crossDrv} --without-python
'' + stdenv.lib.optionalString (target != null)
" --target=${target.config}";
configureFlags = with stdenv.lib;
[ "--with-gmp=${gmp.crossDrv}" "--with-mpfr=${mpfr.crossDrv}" "--with-system-readline"
"--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.crossDrv}" "--without-python"
] ++ optional (target != null) "--target=${target.config}";
};
postInstall =