diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2013-01-10 12:03:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-15 08:10:14 +0000 |
commit | 42d2beec096b6c52b798ac79b78463ad9386d476 (patch) | |
tree | 2e7ad0a63d05d7fa935c8d65511611015b4acfc6 | |
parent | 45b958ba7762aef4beb72e5a5579cb8450a25d4a (diff) | |
download | poky-42d2beec096b6c52b798ac79b78463ad9386d476.tar.gz |
gmp: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.
(From OE-Core rev: 17a58db25657184e0770d29391062e7f93d5bb5b)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Conflicts:
meta/recipes-support/gmp/gmp_5.1.0.bb
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/gmp/gmp-5.1.0/obsolete_automake_macros.patch | 13 | ||||
-rw-r--r-- | meta/recipes-support/gmp/gmp_5.1.0.bb | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-support/gmp/gmp-5.1.0/obsolete_automake_macros.patch b/meta/recipes-support/gmp/gmp-5.1.0/obsolete_automake_macros.patch new file mode 100644 index 0000000000..adff6ca19c --- /dev/null +++ b/meta/recipes-support/gmp/gmp-5.1.0/obsolete_automake_macros.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Upstream-Status: Accepted | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd gmp-5.1.0/configure.in gmp-5.1.0/configure.in | ||
5 | --- gmp-5.1.0/configure.in 2012-12-18 21:05:09.000000000 +0200 | ||
6 | +++ gmp-5.1.0/configure.in 2013-01-02 06:00:41.552958778 +0200 | ||
7 | @@ -67,7 +67,7 @@ | ||
8 | dnl so update there too if changing anything. | ||
9 | dnl | ||
10 | AM_INIT_AUTOMAKE([1.8 gnu no-dependencies]) | ||
11 | -AM_CONFIG_HEADER(config.h:config.in) | ||
12 | +AC_CONFIG_HEADERS(config.h:config.in) | ||
13 | AM_MAINTAINER_MODE | ||
diff --git a/meta/recipes-support/gmp/gmp_5.1.0.bb b/meta/recipes-support/gmp/gmp_5.1.0.bb index eb5ef33ddf..6591ebe80b 100644 --- a/meta/recipes-support/gmp/gmp_5.1.0.bb +++ b/meta/recipes-support/gmp/gmp_5.1.0.bb | |||
@@ -3,9 +3,12 @@ LICENSE="LGPLv3&GPLv3" | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ |
4 | file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790" | 4 | file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790" |
5 | 5 | ||
6 | PR = "r1" | ||
7 | |||
6 | SRC_URI_append = " file://use-includedir.patch \ | 8 | SRC_URI_append = " file://use-includedir.patch \ |
7 | file://gmp_fix_for_x32.patch \ | 9 | file://gmp_fix_for_x32.patch \ |
8 | file://187b7b1646ee.patch \ | 10 | file://187b7b1646ee.patch \ |
11 | file://obsolete_automake_macros.patch \ | ||
9 | " | 12 | " |
10 | 13 | ||
11 | SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78" | 14 | SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78" |