diff options
-rw-r--r-- | meta/recipes-bsp/usbutils/usbutils-008/iconv.patch | 41 | ||||
-rw-r--r-- | meta/recipes-bsp/usbutils/usbutils_008.bb | 28 |
2 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch b/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch new file mode 100644 index 0000000000..6455567174 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | This patch adds support for detecting iconv support using autotools | ||
2 | uclibc does not have iconv implementation inside libc like glibc, therefore | ||
3 | the existing checks were not sufficient, it worked for glibc but not for | ||
4 | uclibc. The new patch portably detects the iconv support and adds the | ||
5 | libiconv to linker cmdline | ||
6 | |||
7 | This patch should be submitted upstream too | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | |||
13 | Index: usbutils-008/configure.ac | ||
14 | =================================================================== | ||
15 | --- usbutils-008.orig/configure.ac | ||
16 | +++ usbutils-008/configure.ac | ||
17 | @@ -10,7 +10,9 @@ AC_USE_SYSTEM_EXTENSIONS | ||
18 | AC_SYS_LARGEFILE | ||
19 | |||
20 | AC_CHECK_HEADERS([byteswap.h]) | ||
21 | -AC_CHECK_FUNCS([nl_langinfo iconv]) | ||
22 | + | ||
23 | +AM_GNU_GETTEXT | ||
24 | +AM_ICONV | ||
25 | |||
26 | PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0) | ||
27 | |||
28 | Index: usbutils-008/Makefile.am | ||
29 | =================================================================== | ||
30 | --- usbutils-008.orig/Makefile.am | ||
31 | +++ usbutils-008/Makefile.am | ||
32 | @@ -29,7 +29,8 @@ lsusb_CPPFLAGS = \ | ||
33 | |||
34 | lsusb_LDADD = \ | ||
35 | $(LIBUSB_LIBS) \ | ||
36 | - $(UDEV_LIBS) | ||
37 | + $(UDEV_LIBS) \ | ||
38 | + $(LIBICONV) | ||
39 | |||
40 | man_MANS = \ | ||
41 | lsusb.8 \ | ||
diff --git a/meta/recipes-bsp/usbutils/usbutils_008.bb b/meta/recipes-bsp/usbutils/usbutils_008.bb new file mode 100644 index 0000000000..b032d4e6b3 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils_008.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | SUMMARY = "Host side USB console utilities" | ||
2 | DESCRIPTION = "Contains the lsusb utility for inspecting the devices connected to the USB bus." | ||
3 | HOMEPAGE = "http://www.linux-usb.org" | ||
4 | SECTION = "base" | ||
5 | |||
6 | LICENSE = "GPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
8 | |||
9 | DEPENDS = "libusb zlib virtual/libiconv systemd" | ||
10 | |||
11 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ | ||
12 | file://usb-devices-avoid-dependency-on-bash.patch \ | ||
13 | file://Fix-NULL-pointer-crash.patch \ | ||
14 | file://iconv.patch \ | ||
15 | " | ||
16 | |||
17 | RC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb" | ||
18 | SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95" | ||
19 | |||
20 | inherit autotools gettext pkgconfig distro_features_check | ||
21 | # This version of usbutils relies on the udev from systemd, so unless | ||
22 | # we can decouple udev from system, we require systemd for now. | ||
23 | REQUIRED_DISTRO_FEATURES = "systemd" | ||
24 | |||
25 | FILES_${PN}-dev += "${datadir}/pkgconfig" | ||
26 | |||
27 | RDEPENDS_${PN} = "libudev" | ||
28 | RDEPENDS_${PN}-ptest = "libboost-system libboost-thread" | ||