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.

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

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 (file)
index 0000000..adff6ca
--- /dev/null
+++ b/meta/recipes-support/gmp/gmp-5.1.0/obsolete_automake_macros.patch
@@ -0,0 +1,13 @@
+Upstream-Status: Accepted
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd gmp-5.1.0/configure.in gmp-5.1.0/configure.in
+--- gmp-5.1.0/configure.in     2012-12-18 21:05:09.000000000 +0200
++++ gmp-5.1.0/configure.in     2013-01-02 06:00:41.552958778 +0200
+@@ -67,7 +67,7 @@
+ dnl  so update there too if changing anything.
+ dnl
+ AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
+-AM_CONFIG_HEADER(config.h:config.in)
++AC_CONFIG_HEADERS(config.h:config.in)
+ 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 eb5ef33ddfc8bf104f529521f99f76f8dcec17e4..6591ebe80b6433e2c40f0ceab2a22dad1ee48f91 100644 (file)
--- 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"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                    file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
 
+PR = "r1"
+
 SRC_URI_append = " file://use-includedir.patch \
                    file://gmp_fix_for_x32.patch \
                    file://187b7b1646ee.patch \
+                   file://obsolete_automake_macros.patch \
                    "
 
 SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78"