alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

automake 1.11: fix test case with Autoconf 2.69

Browse source
This commit is contained in:
Ludovic Courtès 2012-07-07 13:56:19 +02:00
parent af61749b18
commit 74c0e77271
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/tools/misc/automake/automake-1.11.x.nix
View file

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg";
};
patches = [ ./fix-test-autoconf-2.69.patch ];
buildInputs = [perl autoconf makeWrapper];
inherit doCheck;
@ -27,6 +29,9 @@ stdenv.mkDerivation rec {
# "fixed" path in generated files!
dontPatchShebangs = true;
# Run the test suite in parallel.
enableParallelBuilding = true;
meta = {
homepage = http://www.gnu.org/software/automake/;
description = "GNU Automake, a GNU standard-compliant makefile generator";

13
pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch Normal file
View file

@ -0,0 +1,13 @@
With Autoconf 2.69 (instead of 2.68), config.{guess,sub} are needed.
--- automake-1.11.2/tests/compile_f90_c_cxx.test 2011-12-20 21:56:29.000000000 +0100
+++ automake-1.11.2/tests/compile_f90_c_cxx.test 2012-07-07 13:35:58.000000000 +0200
@@ -41,7 +41,7 @@ END
: > baz.cc
$ACLOCAL
-$AUTOMAKE
+$AUTOMAKE --add-missing
# Look for the macros at the beginning of rules. Be careful, as there
# are literal tabs at the beginning of the search strings.