From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SQQEx-0000S7-QW for openembedded-core@lists.openembedded.org; Fri, 04 May 2012 23:40:40 +0200 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 04 May 2012 14:30:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="149486020" Received: from nbuild0.sc.intel.com ([172.25.110.36]) by fmsmga001.fm.intel.com with ESMTP; 04 May 2012 14:30:47 -0700 From: nitin.a.kamble@intel.com To: openembedded-core@lists.openembedded.org Date: Fri, 4 May 2012 14:30:14 -0700 Message-Id: <83b69857f2f5bdb9a8db8a6cedec17d70a1efe84.1336166919.git.nitin.a.kamble@intel.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 08/40] jpeg: fix build with automake 1.12 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 May 2012 21:40:40 -0000 From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../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 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 +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" -- 1.7.7