From 24663048adfc4a1795bfec3ede16dd039d65ba9a Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Wed, 1 Nov 2017 19:48:25 +0200 Subject: [PATCH] libusb1: update to 1.0.20 should maybe be safe, the tracker shows they're keepint compat: https://abi-laboratory.pro/tracker/timeline/libusb/ --- recipes/libusb/libusb1/no-dll.patch | 19 ++++++++++++++++ recipes/libusb/libusb1_1.0.20.bb | 35 +++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 recipes/libusb/libusb1/no-dll.patch create mode 100644 recipes/libusb/libusb1_1.0.20.bb diff --git a/recipes/libusb/libusb1/no-dll.patch b/recipes/libusb/libusb1/no-dll.patch new file mode 100644 index 0000000000..6e6bb83d1f --- /dev/null +++ b/recipes/libusb/libusb1/no-dll.patch @@ -0,0 +1,19 @@ +As all invokes all-recursive which uses sub-makes to invoke all-am, the +resulting makefile wants to build libusb-1.0.la twice. In non-parallel builds +the second attempt is skipped as the target already exists, but in highly +parallel builds it's likely that two makes will be building libusb-1.0.la at the +same time. + +Solve this by removing the explicit all target, which as libusb-1.0.dll isn't +built under Linux is redundant anyway. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/libusb/Makefile.am b/libusb/Makefile.am +index 0cab0a0..c880213 100644 +--- a/libusb/Makefile.am ++++ b/libusb/Makefile.am +@@ -1,2 +0,0 @@ +-all: libusb-1.0.la libusb-1.0.dll +- diff --git a/recipes/libusb/libusb1_1.0.20.bb b/recipes/libusb/libusb1_1.0.20.bb new file mode 100644 index 0000000000..060d892e8c --- /dev/null +++ b/recipes/libusb/libusb1_1.0.20.bb @@ -0,0 +1,35 @@ +SUMMARY = "Userspace library to access USB (version 1.0)" +HOMEPAGE = "http://libusb.sf.net" +BUGTRACKER = "http://www.libusb.org/report" +SECTION = "libs" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ + file://no-dll.patch;patch=1 \ + " + +SRC_URI[md5sum] = "1d4eb194eaaa2bcfbba28102768c7dbf" +SRC_URI[sha256sum] = "cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff" + +S = "${WORKDIR}/libusb-${PV}" + +inherit autotools pkgconfig + +# Don't configure udev by default since it will cause a circular +# dependecy with udev package, which depends on libusb +EXTRA_OECONF = "--libdir=${base_libdir} --disable-udev" + +do_install_append() { + install -d ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi +} + +FILES_${PN} += "${base_libdir}/*.so.*" + +FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" -- 2.39.2