mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

usbutils: Patch to detect iconv support

Browse Source 
Fixes build failures on uclibc

| lsusb-usbmisc.o: In function `usb_string_to_native':
|
/home/kraj/work/angstrom-repo/build/tmp-angstrom_next-uclibc/work/armv7at2hf-vfp-neon-angstrom-linux-uclibceabi/usbutils/007-r0/usbutils-007/usbmisc.c:190:
undefined reference to `libiconv_open'
|
/home/kraj/work/angstrom-repo/build/tmp-angstrom_next-uclibc/work/armv7at2hf-vfp-neon-angstrom-linux-uclibceabi/usbutils/007-r0/usbutils-007/usbmisc.c:199:
undefined reference to `libiconv'
|
/home/kraj/work/angstrom-repo/build/tmp-angstrom_next-uclibc/work/armv7at2hf-vfp-neon-angstrom-linux-uclibceabi/usbutils/007-r0/usbutils-007/usbmisc.c:202:
undefined reference to `libiconv_close'
| collect2: error: ld returned 1 exit status
| make[2]: *** [lsusb] Error 1

(From OE-Core rev: c782d07597c9839aca755c63c65b46c165d54042)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2014-02-14 18:54:37 -08:00
committed by Richard Purdie
parent c33c645953
commit 94ba45932c
2 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-bsp/usbutils/usbutils/iconv.patch
+40
View File
@@ -0,0 +1,40 @@
This patch adds support for detecting iconv support using autotools
uclibc does not have iconv implementation inside libc like glibc, therefore
the existing checks were not sufficient, it worked for glibc but not for
uclibc. The new patch portably detects the iconv support and adds the
libiconv to linker cmdline
This patch should be submitted upstream too
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: usbutils-007/configure.ac
===================================================================
--- usbutils-007.orig/configure.ac
+++ usbutils-007/configure.ac
@@ -10,7 +10,9 @@ AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
AC_CHECK_HEADERS([byteswap.h])
-AC_CHECK_FUNCS([nl_langinfo iconv])
+
+AM_GNU_GETTEXT
+AM_ICONV
AC_ARG_ENABLE(zlib,
AS_HELP_STRING(--disable-zlib,disable support for zlib))
Index: usbutils-007/Makefile.am
===================================================================
--- usbutils-007.orig/Makefile.am
+++ usbutils-007/Makefile.am
@@ -27,7 +27,7 @@ lsusb_CPPFLAGS = \
-DDATADIR=\"$(datadir)\"
lsusb_LDADD = \
- $(LIBUSB_LIBS)
+ $(LIBUSB_LIBS) $(LIBICONV)
if HAVE_ZLIB
lsusb_CPPFLAGS += -DHAVE_LIBZ
meta/recipes-bsp/usbutils/usbutils_007.bb
+5 -3
View File
@@ -6,16 +6,18 @@ SECTION = "base"
LICENSE = "GPLv2+" LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libusb zlib" DEPENDS = "libusb zlib virtual/libiconv"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
file://usb-devices-avoid-dependency-on-bash.patch \ file://usb-devices-avoid-dependency-on-bash.patch \
file://Fix-NULL-pointer-crash.patch" file://Fix-NULL-pointer-crash.patch \
file://iconv.patch \
"
SRC_URI[md5sum] = "be6c42294be5c940f208190d3479d50c" SRC_URI[md5sum] = "be6c42294be5c940f208190d3479d50c"
SRC_URI[sha256sum] = "e65c234cadf7c81b6b1567c440e3b9b31b44f51c27df3e45741b88848d8b37d3" SRC_URI[sha256sum] = "e65c234cadf7c81b6b1567c440e3b9b31b44f51c27df3e45741b88848d8b37d3"
inherit autotools inherit autotools gettext
do_install_append() { do_install_append() {
# We only need the compressed copy, remove the uncompressed version # We only need the compressed copy, remove the uncompressed version