aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/jpeg/jpeg-8d
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-07-05 21:57:44 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:43:36 +0100
commit626676ba039bc5d9427665a52cbe40a202a542c8 (patch)
tree079496559454ba665ae5d6936892fa897922a682 /meta/recipes-core/jpeg/jpeg-8d
parentc6b70eff7614ea774c0d8e39520f76bdce0ed977 (diff)
downloadopenembedded-core-contrib-626676ba039bc5d9427665a52cbe40a202a542c8.tar.gz
openembedded-core-contrib-626676ba039bc5d9427665a52cbe40a202a542c8.tar.bz2
openembedded-core-contrib-626676ba039bc5d9427665a52cbe40a202a542c8.zip
jpeg: fix configure with automake 1.12.1
Bring back earlier jpeg fix. upstream has removed the fix from earlier release. 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 (From OE-Core rev: 893ce9db79a5c4cca8a6b6ed6a9cec81777aba2f) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/jpeg/jpeg-8d')
-rw-r--r--meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch b/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
new file mode 100644
index 00000000000..3a970ea4779
--- /dev/null
+++ b/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
@@ -0,0 +1,44 @@
+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-8d/configure.ac
+===================================================================
+--- jpeg-8d.orig/configure.ac
++++ jpeg-8d/configure.ac
+@@ -21,7 +21,7 @@ AC_CANONICAL_TARGET
+
+ # Initialize Automake
+ # Don't require all the GNU mandated files
+-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete ansi2knr no-dist foreign])
++AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete no-dist foreign])
+
+ # Make --enable-silent-rules the default.
+ # To get verbose build output you may configure
+@@ -29,7 +29,14 @@ AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obs
+ AM_SILENT_RULES([yes])
+
+ # This is required when using the de-ANSI-fication feature.
+-AM_C_PROTOTYPES
++#AM_C_PROTOTYPES
++# add following to avoid this error:
++#| automake: warnings are treated as errors
++#| /srv/home/nitin/builds2/build0/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/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
++#| Makefile.am:65: while processing Libtool library 'libjpeg.la'
++#| autoreconf: automake failed with exit status: 1
++AM_PROG_AR
+
+ # Add configure option --enable-maintainer-mode which enables
+ # dependency checking and generation useful to package maintainers.