Patchwork [meta-oe] xmlto: replace obsolete automake macros with working ones

login
mail settings
Submitter Marko Lindqvist
Date Jan. 7, 2013, 11:22 a.m.
Message ID <1357557759-25093-1-git-send-email-cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/42175/
State Accepted, archived
Commit 83ee268bcf0adf967b2e4762ea5a15eb19cebe34
Headers show

Comments

Marko Lindqvist - Jan. 7, 2013, 11:22 a.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>
---
 .../xmlto/xmlto-0.0.25/obsolete_automake_macros.patch      |   12 ++++++++++++
 meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb              |    6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
Martin Jansa - Jan. 10, 2013, 11:24 a.m.
On Mon, Jan 07, 2013 at 01:22:39PM +0200, Marko Lindqvist wrote:
> Add obsolete_automake_macros.patch that replaces automake macros
> no longer supported by automake-1.13 with modern constructs.

Merged, thanks
> 
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> ---
>  .../xmlto/xmlto-0.0.25/obsolete_automake_macros.patch      |   12 ++++++++++++
>  meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb              |    6 +++++-
>  2 files changed, 17 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
> 
> diff --git a/meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch b/meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
> new file mode 100644
> index 0000000..faa8acc
> --- /dev/null
> +++ b/meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
> @@ -0,0 +1,12 @@
> +diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in
> +--- xmlto-0.0.25/configure.in	2011-12-01 17:49:00.000000000 +0200
> ++++ xmlto-0.0.25/configure.in	2013-01-07 05:24:16.169953519 +0200
> +@@ -1,7 +1,7 @@
> + AC_INIT(xmlto, 0.0.25)
> + AC_CONFIG_SRCDIR(xmlto.spec.in)
> + AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
> +-AM_CONFIG_HEADER(config.h)
> ++AC_CONFIG_HEADERS(config.h)
> +
> + AC_PROG_CC
> + AM_PROG_CC_C_O
> diff --git a/meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb b/meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb
> index 806ea2e..447c791 100644
> --- a/meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb
> +++ b/meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb
> @@ -5,7 +5,11 @@ LICENSE = "GPLv2"
>  
>  LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
>  
> -SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz" 
> +PR = "r1"
> +
> +SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \
> +           file://obsolete_automake_macros.patch \
> +"
>  SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d"
>  SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a"
>  
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch b/meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
new file mode 100644
index 0000000..faa8acc
--- /dev/null
+++ b/meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
@@ -0,0 +1,12 @@ 
+diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in
+--- xmlto-0.0.25/configure.in	2011-12-01 17:49:00.000000000 +0200
++++ xmlto-0.0.25/configure.in	2013-01-07 05:24:16.169953519 +0200
+@@ -1,7 +1,7 @@
+ AC_INIT(xmlto, 0.0.25)
+ AC_CONFIG_SRCDIR(xmlto.spec.in)
+ AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_PROG_CC
+ AM_PROG_CC_C_O
diff --git a/meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb b/meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb
index 806ea2e..447c791 100644
--- a/meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb
+++ b/meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb
@@ -5,7 +5,11 @@  LICENSE = "GPLv2"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz" 
+PR = "r1"
+
+SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \
+           file://obsolete_automake_macros.patch \
+"
 SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d"
 SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a"