diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2016-02-21 18:34:51 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-02-21 21:24:55 +0100 |
| commit | 96eb6862343f59e152a8bc2ea093917d56c2ed4d (patch) | |
| tree | 08697af671d5950c807438a707e0856c00cb9f17 | |
| parent | fd7a2eacb37274e9bfc7d59eb4b3c4840a4c8a2d (diff) | |
| download | buildroot-96eb6862343f59e152a8bc2ea093917d56c2ed4d.tar.gz buildroot-96eb6862343f59e152a8bc2ea093917d56c2ed4d.zip | |
package/openobex: depends on libusb-compat
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>
| -rw-r--r-- | package/openobex/Config.in | 3 | ||||
| -rw-r--r-- | package/openobex/openobex.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/package/openobex/Config.in b/package/openobex/Config.in index 2b8cf38208..ed1b81fe42 100644 --- a/package/openobex/Config.in +++ b/package/openobex/Config.in @@ -22,8 +22,9 @@ comment "bluez support needs a toolchain w/ wchar, threads, dynamic library" config BR2_PACKAGE_OPENOBEX_LIBUSB 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_COMPAT comment "libusb support needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk index b50dbb7fd3..6a1a10ba4f 100644 --- a/package/openobex/openobex.mk +++ b/package/openobex/openobex.mk @@ -36,7 +36,7 @@ OPENOBEX_CONF_OPTS += --disable-bluetooth endif ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y) -OPENOBEX_DEPENDENCIES += libusb +OPENOBEX_DEPENDENCIES += libusb-compat OPENOBEX_CONF_OPTS += --with-usb=$(STAGING_DIR) else OPENOBEX_CONF_OPTS += --disable-usb |
