summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-13 14:41:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 07:50:31 +0000
commitf9d51cd06c0f1b5049c41b9c457cdbca30ae7067 (patch)
tree02de79e1d5e41dcb7fdab27f311e45615a23991f
parentcb01f6d0af2cffaecc77eefb1ad07b1891a8177a (diff)
downloadpoky-f9d51cd06c0f1b5049c41b9c457cdbca30ae7067.tar.gz
libusb1: fix make install race
There's an install race in when building in parallel, remove a redundant rule to stop it happening. (From OE-Core rev: cbdd4099b06011f2b73743c715276c730b7bf576) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libusb/libusb1/no-dll.patch19
-rw-r--r--meta/recipes-support/libusb/libusb1_1.0.20.bb1
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-support/libusb/libusb1/no-dll.patch b/meta/recipes-support/libusb/libusb1/no-dll.patch
new file mode 100644
index 0000000000..6e6bb83d1f
--- /dev/null
+++ b/meta/recipes-support/libusb/libusb1/no-dll.patch
@@ -0,0 +1,19 @@
1As all invokes all-recursive which uses sub-makes to invoke all-am, the
2resulting makefile wants to build libusb-1.0.la twice. In non-parallel builds
3the second attempt is skipped as the target already exists, but in highly
4parallel builds it's likely that two makes will be building libusb-1.0.la at the
5same time.
6
7Solve this by removing the explicit all target, which as libusb-1.0.dll isn't
8built under Linux is redundant anyway.
9
10Upstream-Status: Pending
11Signed-off-by: Ross Burton <ross.burton@intel.com>
12
13diff --git a/libusb/Makefile.am b/libusb/Makefile.am
14index 0cab0a0..c880213 100644
15--- a/libusb/Makefile.am
16+++ b/libusb/Makefile.am
17@@ -1,2 +0,0 @@
18-all: libusb-1.0.la libusb-1.0.dll
19-
diff --git a/meta/recipes-support/libusb/libusb1_1.0.20.bb b/meta/recipes-support/libusb/libusb1_1.0.20.bb
index 21b8b45a6a..4cad2d4be7 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.20.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.20.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
9BBCLASSEXTEND = "native nativesdk" 9BBCLASSEXTEND = "native nativesdk"
10 10
11SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ 11SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
12 file://no-dll.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "1d4eb194eaaa2bcfbba28102768c7dbf" 15SRC_URI[md5sum] = "1d4eb194eaaa2bcfbba28102768c7dbf"