diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-02-14 18:54:37 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-17 15:37:17 +0000 |
commit | 94ba45932c2fcd15aa894c8dc4063a261e993b96 (patch) | |
tree | 40b78fb5adebd7fc12a560baf7717ae8c2839cb1 /meta/recipes-bsp/usbutils/usbutils/iconv.patch | |
parent | c33c645953bbb95ef3428534f8dbd1672ff10532 (diff) | |
download | poky-94ba45932c2fcd15aa894c8dc4063a261e993b96.tar.gz |
usbutils: Patch to detect iconv support
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>
Diffstat (limited to 'meta/recipes-bsp/usbutils/usbutils/iconv.patch')
-rw-r--r-- | meta/recipes-bsp/usbutils/usbutils/iconv.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-bsp/usbutils/usbutils/iconv.patch b/meta/recipes-bsp/usbutils/usbutils/iconv.patch new file mode 100644 index 0000000000..c557334a75 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils/iconv.patch | |||
@@ -0,0 +1,40 @@ | |||
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-007/configure.ac | ||
14 | =================================================================== | ||
15 | --- usbutils-007.orig/configure.ac | ||
16 | +++ usbutils-007/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 | AC_ARG_ENABLE(zlib, | ||
27 | AS_HELP_STRING(--disable-zlib,disable support for zlib)) | ||
28 | Index: usbutils-007/Makefile.am | ||
29 | =================================================================== | ||
30 | --- usbutils-007.orig/Makefile.am | ||
31 | +++ usbutils-007/Makefile.am | ||
32 | @@ -27,7 +27,7 @@ lsusb_CPPFLAGS = \ | ||
33 | -DDATADIR=\"$(datadir)\" | ||
34 | |||
35 | lsusb_LDADD = \ | ||
36 | - $(LIBUSB_LIBS) | ||
37 | + $(LIBUSB_LIBS) $(LIBICONV) | ||
38 | |||
39 | if HAVE_ZLIB | ||
40 | lsusb_CPPFLAGS += -DHAVE_LIBZ | ||