Patchwork [11/28] jpeg: fix build with automake 1.12

login
register
mail settings
Submitter Nitin A Kamble
Date May 3, 2012, 6:15 p.m.
Message ID <85a0ee72f1ddb25e2c704e5d4db03442c65cd0f4.1336068854.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/26995/
State New
Headers show

Comments

Nitin A Kamble - May 3, 2012, 6:15 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../jpeg/jpeg-8c/jpeg_fix_for_automake-1.12.patch  |   41 ++++++++++++++++++++
 meta/recipes-core/jpeg/jpeg_8c.bb                  |    6 ++-
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-core/jpeg/jpeg-8c/jpeg_fix_for_automake-1.12.patch

Patch

diff --git a/meta/recipes-core/jpeg/jpeg-8c/jpeg_fix_for_automake-1.12.patch b/meta/recipes-core/jpeg/jpeg-8c/jpeg_fix_for_automake-1.12.patch
new file mode 100644
index 0000000..e8a2f75
--- /dev/null
+++ b/meta/recipes-core/jpeg/jpeg-8c/jpeg_fix_for_automake-1.12.patch
@@ -0,0 +1,41 @@ 
+Upstream-Status: Pending
+
+automake 1.12 has deprecated  automatic de-ANSI-fication support
+
+this patch avoids this error with automake 1.12
+
+| configure.ac:32: error: automatic de-ANSI-fication support has been removed
+...
+| automake: warnings are treated as errors
+| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libjpeg.la': linking libtool libraries using a non-POSIX
+| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
+
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/02
+
+Index: jpeg-8c/configure.ac
+===================================================================
+--- jpeg-8c.orig/configure.ac
++++ jpeg-8c/configure.ac
+@@ -28,9 +28,6 @@ AM_INIT_AUTOMAKE([-Wall -Werror no-dist
+ # with --disable-silent-rules or use "make V=1".
+ AM_SILENT_RULES([yes])
+ 
+-# This is required when using the de-ANSI-fication feature.
+-AM_C_PROTOTYPES
+-
+ # Add configure option --enable-maintainer-mode which enables
+ # dependency checking and generation useful to package maintainers.
+ # This is made an option to avoid confusing end users.
+@@ -44,6 +41,10 @@ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+ 
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
++
+ # Check if LD supports linker scripts,
+ # and define automake conditional HAVE_LD_VERSION_SCRIPT if so.
+ AC_ARG_ENABLE([ld-version-script],
diff --git a/meta/recipes-core/jpeg/jpeg_8c.bb b/meta/recipes-core/jpeg/jpeg_8c.bb
index 6aeaeaa..c276a51 100644
--- a/meta/recipes-core/jpeg/jpeg_8c.bb
+++ b/meta/recipes-core/jpeg/jpeg_8c.bb
@@ -13,11 +13,13 @@  SECTION = "libs"
 DEPENDS = "libtool-cross"
 DEPENDS_virtclass-native = "libtool-native"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://debian-libjpeg7_7-1.diff \
-           file://fix_for_automake_1.11.2.patch"
+           file://fix_for_automake_1.11.2.patch \
+           file://jpeg_fix_for_automake-1.12.patch \
+          "
 
 SRC_URI[md5sum] = "a2c10c04f396a9ce72894beb18b4e1f9"
 SRC_URI[sha256sum] = "edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a"