summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/jpeg
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-07-06 04:57:44 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 09:54:03 (GMT)
commite24ec0cb5eb9eaa228ac44ce9f1d97341aa87ca6 (patch)
treed4a71001b00a0275a414ecc8279510e7d11bb8b6 /meta/recipes-core/jpeg
parentbf6786ba6329c3bd920280006720ebc3db115ec6 (diff)
downloadpoky-e24ec0cb5eb9eaa228ac44ce9f1d97341aa87ca6.tar.gz
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) (From OE-Core rev: 626676ba039bc5d9427665a52cbe40a202a542c8) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/jpeg')
-rw-r--r--meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch44
-rw-r--r--meta/recipes-core/jpeg/jpeg_8d.bb5
2 files changed, 47 insertions, 2 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 0000000..3a970ea
--- /dev/null
+++ b/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
@@ -0,0 +1,44 @@
1Upstream-Status: Pending
2
3The support for automatic de-ANSI-fication has been deprecated in
4automake 1.11.2, and will be removed altogether in automake 1.12
5
6This avoids this error:
7| configure.ac:24: automatic de-ANSI-fication support is deprecated
8| autoreconf: automake failed with exit status: 1
9| ERROR: autoreconf execution failed.
10NOTE: package jpeg-native-8c-r2: task do_configure: Failed
11
12Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
132011/12/28
14
15
16Index: jpeg-8d/configure.ac
17===================================================================
18--- jpeg-8d.orig/configure.ac
19+++ jpeg-8d/configure.ac
20@@ -21,7 +21,7 @@ AC_CANONICAL_TARGET
21
22 # Initialize Automake
23 # Don't require all the GNU mandated files
24-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete ansi2knr no-dist foreign])
25+AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete no-dist foreign])
26
27 # Make --enable-silent-rules the default.
28 # To get verbose build output you may configure
29@@ -29,7 +29,14 @@ AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obs
30 AM_SILENT_RULES([yes])
31
32 # This is required when using the de-ANSI-fication feature.
33-AM_C_PROTOTYPES
34+#AM_C_PROTOTYPES
35+# add following to avoid this error:
36+#| automake: warnings are treated as errors
37+#| /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
38+#| /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'
39+#| Makefile.am:65: while processing Libtool library 'libjpeg.la'
40+#| autoreconf: automake failed with exit status: 1
41+AM_PROG_AR
42
43 # Add configure option --enable-maintainer-mode which enables
44 # dependency checking and generation useful to package maintainers.
diff --git a/meta/recipes-core/jpeg/jpeg_8d.bb b/meta/recipes-core/jpeg/jpeg_8d.bb
index 61f1c2e..6781619 100644
--- a/meta/recipes-core/jpeg/jpeg_8d.bb
+++ b/meta/recipes-core/jpeg/jpeg_8d.bb
@@ -11,10 +11,11 @@ SECTION = "libs"
11DEPENDS = "libtool-cross" 11DEPENDS = "libtool-cross"
12DEPENDS_virtclass-native = "libtool-native" 12DEPENDS_virtclass-native = "libtool-native"
13 13
14PR = "r0" 14PR = "r1"
15 15
16SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ 16SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
17 file://debian-libjpeg7_7-1.diff" 17 file://debian-libjpeg7_7-1.diff \
18 file://fix_for_automake_1.12.1.patch"
18 19
19SRC_URI[md5sum] = "52654eb3b2e60c35731ea8fc87f1bd29" 20SRC_URI[md5sum] = "52654eb3b2e60c35731ea8fc87f1bd29"
20SRC_URI[sha256sum] = "00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3" 21SRC_URI[sha256sum] = "00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3"