diff options
| -rw-r--r-- | meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-core/jpeg/jpeg_8c.bb | 5 |
2 files changed, 31 insertions, 2 deletions
diff --git a/meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch b/meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch new file mode 100644 index 0000000000..c0d7f3e891 --- /dev/null +++ b/meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 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-8c/configure.ac | ||
| 17 | =================================================================== | ||
| 18 | --- jpeg-8c.orig/configure.ac | ||
| 19 | +++ jpeg-8c/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 ansi2knr no-dist foreign]) | ||
| 25 | +AM_INIT_AUTOMAKE([-Wall -Werror no-dist foreign]) | ||
| 26 | |||
| 27 | # Make --enable-silent-rules the default. | ||
| 28 | # To get verbose build output you may configure | ||
diff --git a/meta/recipes-core/jpeg/jpeg_8c.bb b/meta/recipes-core/jpeg/jpeg_8c.bb index 1c242d19d8..6aeaeaa59b 100644 --- a/meta/recipes-core/jpeg/jpeg_8c.bb +++ b/meta/recipes-core/jpeg/jpeg_8c.bb | |||
| @@ -13,10 +13,11 @@ SECTION = "libs" | |||
| 13 | DEPENDS = "libtool-cross" | 13 | DEPENDS = "libtool-cross" |
| 14 | DEPENDS_virtclass-native = "libtool-native" | 14 | DEPENDS_virtclass-native = "libtool-native" |
| 15 | 15 | ||
| 16 | PR = "r2" | 16 | PR = "r3" |
| 17 | 17 | ||
| 18 | SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ | 18 | SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ |
| 19 | file://debian-libjpeg7_7-1.diff;" | 19 | file://debian-libjpeg7_7-1.diff \ |
| 20 | file://fix_for_automake_1.11.2.patch" | ||
| 20 | 21 | ||
| 21 | SRC_URI[md5sum] = "a2c10c04f396a9ce72894beb18b4e1f9" | 22 | SRC_URI[md5sum] = "a2c10c04f396a9ce72894beb18b4e1f9" |
| 22 | SRC_URI[sha256sum] = "edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a" | 23 | SRC_URI[sha256sum] = "edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a" |
