mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
automake 1.11: fix test case with Autoconf 2.69
This commit is contained in:
parent
af61749b18
commit
74c0e77271
|
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg";
|
sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./fix-test-autoconf-2.69.patch ];
|
||||||
|
|
||||||
buildInputs = [perl autoconf makeWrapper];
|
buildInputs = [perl autoconf makeWrapper];
|
||||||
|
|
||||||
inherit doCheck;
|
inherit doCheck;
|
||||||
|
@ -27,6 +29,9 @@ stdenv.mkDerivation rec {
|
||||||
# "fixed" path in generated files!
|
# "fixed" path in generated files!
|
||||||
dontPatchShebangs = true;
|
dontPatchShebangs = true;
|
||||||
|
|
||||||
|
# Run the test suite in parallel.
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/automake/;
|
homepage = http://www.gnu.org/software/automake/;
|
||||||
description = "GNU Automake, a GNU standard-compliant makefile generator";
|
description = "GNU Automake, a GNU standard-compliant makefile generator";
|
||||||
|
|
|
@ -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.
|
Loading…
Reference in a new issue