From b9175824bae6b90964ee89d88dfbb2e6728a7b69 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 3 Jun 2014 21:01:42 +1100 Subject: [PATCH] Add patch from Cooker to fix issues with perl 5.18 --- automake-1.13.4-hash-order-workaround.patch | 16 ++++++++++++++++ automake.spec | 7 +++++++ 2 files changed, 23 insertions(+) create mode 100644 automake-1.13.4-hash-order-workaround.patch diff --git a/automake-1.13.4-hash-order-workaround.patch b/automake-1.13.4-hash-order-workaround.patch new file mode 100644 index 0000000..a89d299 --- /dev/null +++ b/automake-1.13.4-hash-order-workaround.patch @@ -0,0 +1,16 @@ +diff --git a/t/primary-prefix-invalid-couples.tap b/t/primary-prefix-invalid-couples.tap +index 64f11f8..09b332a 100644 +--- a/t/primary-prefix-invalid-couples.tap ++++ b/t/primary-prefix-invalid-couples.tap +@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1 + # Check that the same failures are present without the '--add-missing' + # option. + mv stderr stderr.old ++cat stderr.old | sort > a + AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples" ++cat stderr | sort > b + command_ok_ "... and with the same diagnostic of 'automake -a'" \ +- diff stderr.old stderr ++ diff a b + + : diff --git a/automake.spec b/automake.spec index 8e0b390..db73b11 100644 --- a/automake.spec +++ b/automake.spec @@ -14,6 +14,13 @@ Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz Source100: fix-old-automake-files # Automatically invoke fix-old-automake-files from aclocal Patch0: automake-1.13.1-automatically-fix-old-files.patch +# Something changed in Perl 5.18 and the testsuite started to fail because +# of random looping in hashes items. Upstream will probably start sorting of +# hash items by default for this failing case ~> we just don't resist on its +# order for now (only testsuite change). +# ~> Downstream +# ~> http://lists.gnu.org/archive/html/bug-automake/2013-07/msg00022.html +Patch1: automake-1.13.4-hash-order-workaround.patch BuildRequires: autoconf BuildRequires: texinfo # tests need these