makedepend: 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>

diff --git a/meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch b/meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch
new file mode 100644 (file)
index 0000000..d3a1695
--- /dev/null
+++ b/meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-status: Accepted [https://bugs.freedesktop.org/show_bug.cgi?id=59005]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd makedepend-1.0.4/configure.ac makedepend-1.0.4/configure.ac
+--- makedepend-1.0.4/configure.ac      2012-03-08 07:54:20.000000000 +0200
++++ makedepend-1.0.4/configure.ac      2013-01-02 16:28:21.920132502 +0200
+@@ -2,7 +2,7 @@
+ AC_INIT([makedepend], [1.0.4],
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-AM_CONFIG_HEADER([makedepend-config.h])
++AC_CONFIG_HEADERS([makedepend-config.h])
+
+ # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],

diff --git a/meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb b/meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb
index fea0b22e6f6fc04a176d8d4e8362633a50837748..899391d823dde0497c8f8b77353cb72d64551ac6 100644 (file)
--- a/meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb
@@ -11,12 +11,14 @@ can reference files having other #include directives, and parsing will \
 occur in these files as well."
 
 DEPENDS = "xproto util-macros"
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 BBCLASSEXTEND = "native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=43a6eda34b48ee821b3b66f4f753ce4f"
 
+SRC_URI += "file://obsolete_automake_macros.patch"
+
 SRC_URI[md5sum] = "bf1c54028427829c9c3193bef710dbee"
 SRC_URI[sha256sum] = "f53b8ce5dec02a05f8994036a8ebac485a96324143ff2382e29578fdc096b04f"