summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch')
-rw-r--r--meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch b/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
index e38e0a8869..bbbca89e8f 100644
--- a/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
+++ b/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
@@ -1,10 +1,11 @@
1From a4fd84bdc69e9929a1040f20ea291ee3115bf5b2 Mon Sep 17 00:00:00 2001 1From fff7cbc01e061a235852f385866fe75fb17867e3 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Valentin Popa <valentin.popa@intel.com>
3Date: Mon, 15 Apr 2013 11:16:20 +0200 3Date: Tue, 26 Nov 2013 12:06:55 +0200
4Subject: [PATCH] configure: lower automake requirement 4Subject: [PATCH] configure: lower automake requirement
5 5
6We're not using parallel tests in OE-core yet 6We're not using parallel tests in OE-core yet
7 7
8Signed-off-by: Valentin Popa <valentin.popa@intel.com>
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9 10
10Upstream-Status: Inapropriate [OE specific build hack] 11Upstream-Status: Inapropriate [OE specific build hack]
@@ -13,18 +14,18 @@ Upstream-Status: Inapropriate [OE specific build hack]
13 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
14 15
15diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
16index 1745d31..7f015fe 100644 17index 28200c3..fab2515 100644
17--- a/configure.ac 18--- a/configure.ac
18+++ b/configure.ac 19+++ b/configure.ac
19@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts]) 20@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts])
20 # dist-xz requires automake 1.11 or later 21 # dist-xz requires automake 1.11 or later
21 # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1 22 # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
22 # 1.13 is required for parallel tests 23 # 1.13 is required for parallel tests
23-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules]) 24-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects])
24+AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules]) 25+AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules subdir-objects])
25 # The following line causes --disable-maintainer-mode to be the default to 26 # The following line causes --disable-maintainer-mode to be the default to
26 # configure, this is necessary because libpng distributions cannot rely on the 27 # configure, this is necessary because libpng distributions cannot rely on the
27 # time stamps of the autotools generated files being correct 28 # time stamps of the autotools generated files being correct
28-- 29--
291.8.1.4 301.8.3.2
30 31