aboutsummaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-17 18:03:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-29 23:41:38 +0000
commitaddf309165059a113a6d02ea5fb29a0f495c1485 (patch)
tree14fe0ce2d20abd1e776434ab55087e6eb20b94a2 /meta
parent502cdfe3dd5ea3cd70937c92ff1bd8d6faa829eb (diff)
downloadopenembedded-core-addf309165059a113a6d02ea5fb29a0f495c1485.zip
openembedded-core-addf309165059a113a6d02ea5fb29a0f495c1485.tar.gz
openembedded-core-addf309165059a113a6d02ea5fb29a0f495c1485.tar.bz2
usbutils: remove uclibc-specific patch
This patch is only needed for uclibc, which we don't support in oe-core anymore. Signed-off-by: Ross Burton <ross.burton@intel.com>
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 6455567..0000000
--- a/meta/recipes-bsp/usbutils/usbutils/iconv.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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-008/configure.ac
-===================================================================
---- usbutils-008.orig/configure.ac
-+++ usbutils-008/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
-
- PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0)
-
-Index: usbutils-008/Makefile.am
-===================================================================
---- usbutils-008.orig/Makefile.am
-+++ usbutils-008/Makefile.am
-@@ -29,7 +29,8 @@ lsusb_CPPFLAGS = \
-
- lsusb_LDADD = \
- $(LIBUSB_LIBS) \
-- $(UDEV_LIBS)
-+ $(UDEV_LIBS) \
-+ $(LIBICONV)
-
- man_MANS = \
- lsusb.8 \
diff --git a/meta/recipes-bsp/usbutils/usbutils_008.bb b/meta/recipes-bsp/usbutils/usbutils_008.bb
index d3c5bd5..3c821ea 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"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
file://usb-devices-avoid-dependency-on-bash.patch \
file://Fix-NULL-pointer-crash.patch \
- file://iconv.patch \
"
SRC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb"
SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95"
-inherit autotools gettext pkgconfig distro_features_check
+inherit autotools pkgconfig distro_features_check
FILES_${PN}-dev += "${datadir}/pkgconfig"