Patchwork [meta-oe,2/3] libmikmod: replace obsolete automake macros with working ones

login
mail settings
Submitter Marko Lindqvist
Date Jan. 3, 2013, 6:54 p.m.
Message ID <1357239255-20959-3-git-send-email-cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/41913/
State Accepted, archived
Commit b47164a8c0d8c159f1864e3eaa6b55271aef4ec0
Headers show

Comments

Marko Lindqvist - Jan. 3, 2013, 6:54 p.m.
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>
---
 .../mikmod/libmikmod/obsolete_automake_macros.patch     |   15 +++++++++++++++
 meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb   |    1 +
 2 files changed, 16 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch

Patch

diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch b/meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch
new file mode 100644
index 0000000..082bb04
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@ 
+Upstream-Status: Submitted (https://sourceforge.net/tracker/?func=detail&aid=3599281&group_id=40531&atid=428227)
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libmikmod-3.1.12/configure.in libmikmod-3.1.12/configure.in
+--- libmikmod-3.1.12/configure.in	2007-12-15 11:22:57.000000000 +0200
++++ libmikmod-3.1.12/configure.in	2013-01-03 07:26:10.662775603 +0200
+@@ -13,7 +13,7 @@
+ LIBMIKMOD_VERSION=$LIBMIKMOD_MAJOR_VERSION.$LIBMIKMOD_MINOR_VERSION.$LIBMIKMOD_MICRO_VERSION$BETA
+
+ AM_INIT_AUTOMAKE(libmikmod,$LIBMIKMOD_VERSION)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+
+ # ==============================================================
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
index cd80a6f..af5b5ff 100644
--- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
@@ -11,6 +11,7 @@  SRC_URI = "\
   file://autofoo.patch \
   file://ldflags.patch \
   file://CVE-2010-2971.patch \
+  file://obsolete_automake_macros.patch \
 "
 
 SRC_URI[md5sum] = "9f3c740298260d5f88981fc0d51f6f16"