gdb: Drop outdated "bleeding edge" version
Also note that Nixpkgs shoould ship "bleeding edge" versions unless there is some compelling reason.
This commit is contained in:
parent
2057d7b14b
commit
b0359cdf11
@ -1,20 +1,14 @@
|
|||||||
{ fetchurl, fetchgit, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
|
{ fetchurl, fetchgit, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
|
||||||
, dejagnu, python, target ? null
|
, dejagnu, python, target ? null
|
||||||
|
|
||||||
# Set it to true to fetch the latest release/branchpoint from git.
|
|
||||||
, bleedingEdgeVersion ? false
|
|
||||||
|
|
||||||
# Additional dependencies for GNU/Hurd.
|
# Additional dependencies for GNU/Hurd.
|
||||||
, mig ? null, hurd ? null
|
, mig ? null, hurd ? null
|
||||||
|
|
||||||
# needed for the git version
|
}:
|
||||||
, flex, bison }:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
basename =
|
|
||||||
if bleedingEdgeVersion
|
basename = "gdb-7.4.1";
|
||||||
then "gdb-7.3.20110726"
|
|
||||||
else "gdb-7.4.1";
|
|
||||||
|
|
||||||
# Whether (cross-)building for GNU/Hurd. This is an approximation since
|
# Whether (cross-)building for GNU/Hurd. This is an approximation since
|
||||||
# having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
|
# having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
|
||||||
@ -22,6 +16,7 @@ let
|
|||||||
isGNU =
|
isGNU =
|
||||||
stdenv.system == "i686-gnu"
|
stdenv.system == "i686-gnu"
|
||||||
|| (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu");
|
|| (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu");
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
assert isGNU -> mig != null && hurd != null;
|
assert isGNU -> mig != null && hurd != null;
|
||||||
@ -30,36 +25,28 @@ stdenv.mkDerivation rec {
|
|||||||
name = basename + stdenv.lib.optionalString (target != null)
|
name = basename + stdenv.lib.optionalString (target != null)
|
||||||
("-" + target.config);
|
("-" + target.config);
|
||||||
|
|
||||||
src =
|
src = fetchurl {
|
||||||
if bleedingEdgeVersion
|
|
||||||
then fetchgit {
|
|
||||||
url = "git://sourceware.org/git/gdb.git";
|
|
||||||
rev = "refs/tags/gdb_7_3-2011-07-26-release";
|
|
||||||
}
|
|
||||||
else fetchurl {
|
|
||||||
url = "mirror://gnu/gdb/${basename}.tar.bz2";
|
url = "mirror://gnu/gdb/${basename}.tar.bz2";
|
||||||
# md5 is provided by the annoucement page
|
|
||||||
# http://www.gnu.org/s/gdb/download/ANNOUNCEMENT
|
|
||||||
md5 = "8854d34691087ec127d934692639855f";
|
md5 = "8854d34691087ec127d934692639855f";
|
||||||
};
|
};
|
||||||
|
|
||||||
# I think python is not a native input, but I leave it
|
# I think python is not a native input, but I leave it
|
||||||
# here while I will not need it cross building
|
# here while I will not need it cross building
|
||||||
buildNativeInputs = [ texinfo python ]
|
buildNativeInputs = [ texinfo python ]
|
||||||
++ stdenv.lib.optional isGNU mig
|
++ stdenv.lib.optional isGNU mig;
|
||||||
++ stdenv.lib.optionals bleedingEdgeVersion [ flex bison ];
|
|
||||||
|
|
||||||
buildInputs = [ ncurses readline gmp mpfr expat ]
|
buildInputs = [ ncurses readline gmp mpfr expat ]
|
||||||
++ stdenv.lib.optional isGNU hurd
|
++ stdenv.lib.optional isGNU hurd
|
||||||
++ stdenv.lib.optional doCheck dejagnu;
|
++ stdenv.lib.optional doCheck dejagnu;
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
configureFlags = with stdenv.lib;
|
configureFlags = with stdenv.lib;
|
||||||
'' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline
|
'' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline
|
||||||
--with-expat --with-libexpat-prefix=${expat}
|
--with-expat --with-libexpat-prefix=${expat}
|
||||||
''
|
''
|
||||||
+ optionalString (target != null) " --target=${target.config}"
|
+ optionalString (target != null) " --target=${target.config}"
|
||||||
+ optionalString (elem stdenv.system platforms.cygwin) " --without-python"
|
+ optionalString (elem stdenv.system platforms.cygwin) " --without-python";
|
||||||
;
|
|
||||||
|
|
||||||
crossAttrs = {
|
crossAttrs = {
|
||||||
# Do not add --with-python here to avoid cross building it.
|
# Do not add --with-python here to avoid cross building it.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user