diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-07-05 21:57:44 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:54:03 +0100 |
commit | e24ec0cb5eb9eaa228ac44ce9f1d97341aa87ca6 (patch) | |
tree | d4a71001b00a0275a414ecc8279510e7d11bb8b6 /meta/recipes-core/jpeg/jpeg-8d | |
parent | bf6786ba6329c3bd920280006720ebc3db115ec6 (diff) | |
download | poky-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/jpeg-8d')
-rw-r--r-- | meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 |
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 0000000000..3a970ea477 --- /dev/null +++ b/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | The support for automatic de-ANSI-fication has been deprecated in | ||
4 | automake 1.11.2, and will be removed altogether in automake 1.12 | ||
5 | |||
6 | This 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. | ||
10 | NOTE: package jpeg-native-8c-r2: task do_configure: Failed | ||
11 | |||
12 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
13 | 2011/12/28 | ||
14 | |||
15 | |||
16 | Index: 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. | ||