summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/usbutils/usbutils/iconv.patch41
-rw-r--r--meta/recipes-bsp/usbutils/usbutils_008.bb3
2 files changed, 1 insertions, 43 deletions
diff --git a/meta/recipes-bsp/usbutils/usbutils/iconv.patch b/meta/recipes-bsp/usbutils/usbutils/iconv.patch
deleted file mode 100644
index 6455567174..0000000000
--- a/meta/recipes-bsp/usbutils/usbutils/iconv.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1This patch adds support for detecting iconv support using autotools
2uclibc does not have iconv implementation inside libc like glibc, therefore
3the existing checks were not sufficient, it worked for glibc but not for
4uclibc. The new patch portably detects the iconv support and adds the
5libiconv to linker cmdline
6
7This patch should be submitted upstream too
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13Index: 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
28Index: 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
index d3c5bd52a4..3c821eac37 100644
--- a/meta/recipes-bsp/usbutils/usbutils_008.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_008.bb
@@ -11,13 +11,12 @@ DEPENDS = "libusb zlib virtual/libiconv udev"
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ 11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
12 file://usb-devices-avoid-dependency-on-bash.patch \ 12 file://usb-devices-avoid-dependency-on-bash.patch \
13 file://Fix-NULL-pointer-crash.patch \ 13 file://Fix-NULL-pointer-crash.patch \
14 file://iconv.patch \
15 " 14 "
16 15
17SRC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb" 16SRC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb"
18SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95" 17SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95"
19 18
20inherit autotools gettext pkgconfig distro_features_check 19inherit autotools pkgconfig distro_features_check
21 20
22FILES_${PN}-dev += "${datadir}/pkgconfig" 21FILES_${PN}-dev += "${datadir}/pkgconfig"
23 22