mirror of
https://git.yoctoproject.org/poky
synced 2026-09-13 09:49:32 +02:00
usbutils: remove uclibc-specific patch
This patch is only needed for uclibc, which we don't support in oe-core anymore. (From OE-Core rev: addf309165059a113a6d02ea5fb29a0f495c1485) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3d17d37b21
commit
ed48e7b4f0
@@ -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 \
|
|
||||||
@@ -11,13 +11,12 @@ DEPENDS = "libusb zlib virtual/libiconv udev"
|
|||||||
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] = "cb20148c2e784577e924a7b4c560c8fb"
|
SRC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb"
|
||||||
SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95"
|
SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95"
|
||||||
|
|
||||||
inherit autotools gettext pkgconfig distro_features_check
|
inherit autotools pkgconfig distro_features_check
|
||||||
|
|
||||||
FILES_${PN}-dev += "${datadir}/pkgconfig"
|
FILES_${PN}-dev += "${datadir}/pkgconfig"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user