NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/openobex: depends on libusb-compat

Browse Source 
Openobex looks for libusb.pc provided by libusb-compat, not libusb-1.0.pc
provided by libusb:
https://github.com/zuckschwerdt/openobex/blob/master/acinclude.m4#L171

Openobex links against both libusb (libusb-1.0.so.0) and libusb-compat
(libusb-0.1.so.4):
$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/ircp | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libopenobex.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libusb-0.1.so.4]
 0x0000000000000001 (NEEDED)             Shared library: [libusb-1.0.so.0]
[...]

This patch changes the dependency in openobex.mk and also selects
libusb-compat.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2016-02-21 18:34:51 +01:00 committed by Thomas Petazzoni
parent fd7a2eacb3
commit 96eb686234
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/openobex/Config.in
View File

@ -22,8 +22,9 @@ comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
config BR2_PACKAGE_OPENOBEX_LIBUSB config BR2_PACKAGE_OPENOBEX_LIBUSB
bool "enable libusb support" bool "enable libusb support"
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
comment "libusb support needs a toolchain w/ threads" comment "libusb support needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS

2
package/openobex/openobex.mk
View File

@ -36,7 +36,7 @@ OPENOBEX_CONF_OPTS += --disable-bluetooth
endif endif
ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y) ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
OPENOBEX_DEPENDENCIES += libusb OPENOBEX_DEPENDENCIES += libusb-compat
OPENOBEX_CONF_OPTS += --with-usb=$(STAGING_DIR) OPENOBEX_CONF_OPTS += --with-usb=$(STAGING_DIR)
else else
OPENOBEX_CONF_OPTS += --disable-usb OPENOBEX_CONF_OPTS += --disable-usb