diff options
-rw-r--r-- | recipes/automake/automake-1.11.1/automake-dont-execute-perl.patch | 19 | ||||
-rw-r--r-- | recipes/automake/automake_1.11.1.bb | 5 |
2 files changed, 22 insertions, 2 deletions
diff --git a/recipes/automake/automake-1.11.1/automake-dont-execute-perl.patch b/recipes/automake/automake-1.11.1/automake-dont-execute-perl.patch new file mode 100644 index 0000000000..52f0441ef6 --- /dev/null +++ b/recipes/automake/automake-1.11.1/automake-dont-execute-perl.patch @@ -0,0 +1,19 @@ +We don't patch configure.ac as aclocal.m4 has a dependency upon it, which +breaks compilation. + +diff -ur automake-1.11.1.orig/configure automake-1.11.1/configure +--- automake-1.11.1.orig/configure 2009-12-09 04:45:46.000000000 +1030 ++++ automake-1.11.1/configure 2010-12-01 14:01:54.000000000 +1030 +@@ -2303,12 +2303,6 @@ + if test -z "$PERL"; then + as_fn_error "perl not found" "$LINENO" 5 + fi +-$PERL -e 'require 5.006;' || { +- as_fn_error "perl 5.6 or better is required; perl 5.8.2 or better +-is recommended. If you have several perl versions +-installed, select the one Automake should use using +- ./configure PERL=/path/to/perl" "$LINENO" 5 +-} + + # We require ithreads support, and version 5.7.2 for CLONE. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PERL supports ithreads" >&5 diff --git a/recipes/automake/automake_1.11.1.bb b/recipes/automake/automake_1.11.1.bb index 057987508f..2f4af3ae19 100644 --- a/recipes/automake/automake_1.11.1.bb +++ b/recipes/automake/automake_1.11.1.bb @@ -1,7 +1,8 @@ require automake.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" -SRC_URI += "file://0001-py-compile-compile-only-optimized-byte-code.patch" +SRC_URI += "file://0001-py-compile-compile-only-optimized-byte-code.patch \ + file://automake-dont-execute-perl.patch" SRC_URI[automake.md5sum] = "c2972c4d9b3e29c03d5f2af86249876f" SRC_URI[automake.sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae" |