summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:12 +0000
commit1b1e1b3f0a31f7e21a881a5d4a251ec6e5f5e9bf (patch)
tree30622bad0d00e002dfad519e0b98aab925bea678 /meta/recipes-support
parentf34fe1869306e13f19adc0ccda155236c022e4cf (diff)
downloadpoky-1b1e1b3f0a31f7e21a881a5d4a251ec6e5f5e9bf.tar.gz
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 <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-support/libusb/libusb-compat_0.1.4.bb3
-rw-r--r--meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-support/libusb/libusb1_1.0.9.bb6
4 files changed, 36 insertions, 3 deletions
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 @@
1Upstream-status: Submitted [https://libusb.org/ticket/161]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libusb-compat-0.1.4/configure.ac libusb-compat-0.1.4/configure.ac
5--- libusb-compat-0.1.4/configure.ac 2012-04-24 08:45:46.000000000 +0300
6+++ libusb-compat-0.1.4/configure.ac 2013-01-02 16:41:30.440115202 +0200
7@@ -1,7 +1,7 @@
8 AC_INIT([libusb-compat], [0.1.4])
9 AM_INIT_AUTOMAKE
10 AC_CONFIG_SRCDIR([libusb/core.c])
11-AM_CONFIG_HEADER([config.h])
12+AC_CONFIG_HEADERS([config.h])
13 AC_CONFIG_MACRO_DIR([m4])
14
15 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"
16BBCLASSEXTEND = "native nativesdk" 16BBCLASSEXTEND = "native nativesdk"
17 17
18PE = "1" 18PE = "1"
19PR = "r0" 19PR = "r1"
20 20
21SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ 21SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
22 file://obsolete_automake_macros.patch \
22 " 23 "
23# file://0.1.0-beta1-gcc3.4-fix.patch" 24# file://0.1.0-beta1-gcc3.4-fix.patch"
24 25
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 @@
1Upstream-Status: Submitted [https://libusb.org/ticket/159]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libusb-1.0.9/configure.ac libusb-1.0.9/configure.ac
5--- libusb-1.0.9/configure.ac 2012-04-20 09:44:27.000000000 +0300
6+++ libusb-1.0.9/configure.ac 2013-01-02 16:36:44.152121483 +0200
7@@ -31,7 +31,7 @@
8
9 AC_CONFIG_SRCDIR([libusb/core.c])
10 AC_CONFIG_MACRO_DIR([m4])
11-AM_CONFIG_HEADER([config.h])
12+AC_CONFIG_HEADERS([config.h])
13 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
14
15 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"
8 8
9BBCLASSEXTEND = "native nativesdk" 9BBCLASSEXTEND = "native nativesdk"
10 10
11PR = "r0" 11PR = "r1"
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" 13SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
14 file://obsolete_automake_macros.patch \
15 "
14 16
15SRC_URI[md5sum] = "7f5a02375ad960d4e33a6dae7d63cfcb" 17SRC_URI[md5sum] = "7f5a02375ad960d4e33a6dae7d63cfcb"
16SRC_URI[sha256sum] = "e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b" 18SRC_URI[sha256sum] = "e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b"