summaryrefslogtreecommitdiff
path: root/meta/recipes-core/jpeg
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-28 10:11:05 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:10:47 +0000
commit893ce9db79a5c4cca8a6b6ed6a9cec81777aba2f (patch)
tree63489118722b8f5f349cd6f4b5b5fea1a81800a6 /meta/recipes-core/jpeg
parentf4ffe39450c3da33b24766a5f83ad06cc8ff950c (diff)
downloadopenembedded-core-893ce9db79a5c4cca8a6b6ed6a9cec81777aba2f.tar.gz
openembedded-core-893ce9db79a5c4cca8a6b6ed6a9cec81777aba2f.tar.bz2
openembedded-core-893ce9db79a5c4cca8a6b6ed6a9cec81777aba2f.zip
jpeg: fix configure with automake 1.11.2
The support for automatic de-ANSI-fication has been deprecated in automake 1.11.2, and will be removed altogether in automake 1.12 This avoids this error: | configure.ac:24: automatic de-ANSI-fication support is deprecated | autoreconf: automake failed with exit status: 1 | ERROR: autoreconf execution failed. NOTE: package jpeg-native-8c-r2: task do_configure: Failed Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-core/jpeg')
-rw-r--r--meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch28
-rw-r--r--meta/recipes-core/jpeg/jpeg_8c.bb5
2 files changed, 31 insertions, 2 deletions
diff --git a/meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch b/meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch
new file mode 100644
index 0000000000..c0d7f3e891
--- /dev/null
+++ b/meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch
@@ -0,0 +1,28 @@
+Upstream-Status: Pending
+
+The support for automatic de-ANSI-fication has been deprecated in
+automake 1.11.2, and will be removed altogether in automake 1.12
+
+This avoids this error:
+| configure.ac:24: automatic de-ANSI-fication support is deprecated
+| autoreconf: automake failed with exit status: 1
+| ERROR: autoreconf execution failed.
+NOTE: package jpeg-native-8c-r2: task do_configure: Failed
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2011/12/28
+
+
+Index: jpeg-8c/configure.ac
+===================================================================
+--- jpeg-8c.orig/configure.ac
++++ jpeg-8c/configure.ac
+@@ -21,7 +21,7 @@ AC_CANONICAL_TARGET
+
+ # Initialize Automake
+ # Don't require all the GNU mandated files
+-AM_INIT_AUTOMAKE([-Wall -Werror ansi2knr no-dist foreign])
++AM_INIT_AUTOMAKE([-Wall -Werror no-dist foreign])
+
+ # Make --enable-silent-rules the default.
+ # To get verbose build output you may configure
diff --git a/meta/recipes-core/jpeg/jpeg_8c.bb b/meta/recipes-core/jpeg/jpeg_8c.bb
index 1c242d19d8..6aeaeaa59b 100644
--- a/meta/recipes-core/jpeg/jpeg_8c.bb
+++ b/meta/recipes-core/jpeg/jpeg_8c.bb
@@ -13,10 +13,11 @@ SECTION = "libs"
DEPENDS = "libtool-cross"
DEPENDS_virtclass-native = "libtool-native"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
- file://debian-libjpeg7_7-1.diff;"
+ file://debian-libjpeg7_7-1.diff \
+ file://fix_for_automake_1.11.2.patch"
SRC_URI[md5sum] = "a2c10c04f396a9ce72894beb18b4e1f9"
SRC_URI[sha256sum] = "edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a"