From 1b1e1b3f0a31f7e21a881a5d4a251ec6e5f5e9bf Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 8 Jan 2013 09:16:39 +0200 Subject: [PATCH] libusb: 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: daee74c11411b78560a9682675a215da634a142a) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../obsolete_automake_macros.patch | 15 +++++++++++++++ .../recipes-support/libusb/libusb-compat_0.1.4.bb | 3 ++- .../libusb1-1.0.9/obsolete_automake_macros.patch | 15 +++++++++++++++ meta/recipes-support/libusb/libusb1_1.0.9.bb | 6 ++++-- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch create mode 100644 meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch diff --git a/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch new file mode 100644 index 0000000000..bc29de20b2 --- /dev/null +++ b/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-status: Submitted [https://libusb.org/ticket/161] + +Signed-off-by: Marko Lindqvist +diff -Nurd libusb-compat-0.1.4/configure.ac libusb-compat-0.1.4/configure.ac +--- libusb-compat-0.1.4/configure.ac 2012-04-24 08:45:46.000000000 +0300 ++++ libusb-compat-0.1.4/configure.ac 2013-01-02 16:41:30.440115202 +0200 +@@ -1,7 +1,7 @@ + AC_INIT([libusb-compat], [0.1.4]) + AM_INIT_AUTOMAKE + AC_CONFIG_SRCDIR([libusb/core.c]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) + + AC_PREREQ([2.50]) diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.4.bb b/meta/recipes-support/libusb/libusb-compat_0.1.4.bb index 24df017d21..d74307262b 100644 --- a/meta/recipes-support/libusb/libusb-compat_0.1.4.bb +++ b/meta/recipes-support/libusb/libusb-compat_0.1.4.bb @@ -16,9 +16,10 @@ PROVIDES = "libusb virtual/libusb0" BBCLASSEXTEND = "native nativesdk" PE = "1" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ + file://obsolete_automake_macros.patch \ " # file://0.1.0-beta1-gcc3.4-fix.patch" diff --git a/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch new file mode 100644 index 0000000000..b1dd66c969 --- /dev/null +++ b/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Submitted [https://libusb.org/ticket/159] + +Signed-off-by: Marko Lindqvist +diff -Nurd libusb-1.0.9/configure.ac libusb-1.0.9/configure.ac +--- libusb-1.0.9/configure.ac 2012-04-20 09:44:27.000000000 +0300 ++++ libusb-1.0.9/configure.ac 2013-01-02 16:36:44.152121483 +0200 +@@ -31,7 +31,7 @@ + + AC_CONFIG_SRCDIR([libusb/core.c]) + AC_CONFIG_MACRO_DIR([m4]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + + AC_PREREQ([2.50]) diff --git a/meta/recipes-support/libusb/libusb1_1.0.9.bb b/meta/recipes-support/libusb/libusb1_1.0.9.bb index e002374bdc..012ac275dd 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.9.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.9.bb @@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" BBCLASSEXTEND = "native nativesdk" -PR = "r0" +PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ + file://obsolete_automake_macros.patch \ + " SRC_URI[md5sum] = "7f5a02375ad960d4e33a6dae7d63cfcb" SRC_URI[sha256sum] = "e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b"