From c28b05f02b2d854b4a25d076d25234b639c96519 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 10 Jan 2013 11:58:52 +0200 Subject: [PATCH] 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. (From OE-Core rev: 6cb2ef796278b0747cda4771091d9fdc1603bea7) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../obsolete_automake_macros.patch | 15 +++++++++++++++ .../xorg-util/makedepend_1.0.4.bb | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch 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 index 0000000000..d3a1695613 --- /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 +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 fea0b22e6f..899391d823 100644 --- 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"