diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-03-21 18:03:38 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-21 18:03:38 +0000 |
| commit | 9b7d42afce80a7ae0013a5d6555fdb936cfb762c (patch) | |
| tree | 2f12f6ed854737a3f0299358303916688f900be7 /sys-apps/usbutils/files | |
| parent | Fix build with glibc-2.11, thanks to Mike Frysinger, bug #310569 (diff) | |
| download | gentoo-2-9b7d42afce80a7ae0013a5d6555fdb936cfb762c.tar.gz gentoo-2-9b7d42afce80a7ae0013a5d6555fdb936cfb762c.tar.bz2 gentoo-2-9b7d42afce80a7ae0013a5d6555fdb936cfb762c.zip | |
old
Diffstat (limited to 'sys-apps/usbutils/files')
| -rw-r--r-- | sys-apps/usbutils/files/usbutils-0.72-update-usbids.patch | 34 | ||||
| -rw-r--r-- | sys-apps/usbutils/files/usbutils-0.73-byteorder.patch | 40 |
2 files changed, 0 insertions, 74 deletions
diff --git a/sys-apps/usbutils/files/usbutils-0.72-update-usbids.patch b/sys-apps/usbutils/files/usbutils-0.72-update-usbids.patch deleted file mode 100644 index fc90773cc9bc..000000000000 --- a/sys-apps/usbutils/files/usbutils-0.72-update-usbids.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- update-usbids.sh -+++ update-usbids.sh -@@ -2,13 +2,23 @@ - - # see also update-pciids.sh (fancier) - -+[ "$1" = "-q" ] && quiet="true" || quiet="false" -+ - set -e - SRC="http://www.linux-usb.org/usb.ids" - DEST=usb.ids - -+# if usb.ids is read-only (because the filesystem is read-only), -+# then just skip this whole process. -+if ! touch ${DEST} >&2 >/dev/null ; then -+ ${quiet} || echo "${DEST} is read-only, exiting." -+ exit 0 -+fi -+ --if which wget >/dev/null ; then -+if which wget >/dev/null 2>&1 ; then - DL="wget -O $DEST.new $SRC" --elif which lynx >/dev/null ; then -+ ${quiet} && DL="$DL -q" -+elif which lynx >/dev/null 2>&1 ; then - DL="eval lynx -source $SRC >$DEST.new" - else - echo >&2 "update-usbids: cannot find wget nor lynx" -@@ -33,4 +43,4 @@ - fi - mv $DEST.new $DEST - --echo "Done." -+${quiet} || echo "Done." diff --git a/sys-apps/usbutils/files/usbutils-0.73-byteorder.patch b/sys-apps/usbutils/files/usbutils-0.73-byteorder.patch deleted file mode 100644 index 76cd9505e7f9..000000000000 --- a/sys-apps/usbutils/files/usbutils-0.73-byteorder.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ur usbutils-0.73.old/configure.in usbutils-0.73.new/configure.in ---- usbutils-0.73.old/configure.in 2007-11-13 10:19:41 -0500 -+++ usbutils-0.73.new/configure.in 2007-11-13 10:23:12 -0500 -@@ -20,10 +20,11 @@ - AC_FUNC_ALLOCA - AC_HEADER_DIRENT - AC_HEADER_STDC --AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h getopt.h errno.h ]) -+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h getopt.h errno.h asm/byteorder.h machine/endian.h]) - --# Checks for typedefs, structures, and compiler characteristics. -+# Checks for typedefs, structures, byte order, and compiler characteristics. - AC_C_CONST -+AC_C_BIGENDIAN - AC_TYPE_OFF_T - AC_TYPE_SIZE_T - -diff -ur usbutils-0.73.old/lsusb.c usbutils-0.73.new/lsusb.c ---- usbutils-0.73.old/lsusb.c 2007-11-13 10:19:41 -0500 -+++ usbutils-0.73.new/lsusb.c 2007-11-13 10:23:12 -0500 -@@ -35,8 +35,17 @@ - #include <errno.h> - #include <stdio.h> - #include <stdarg.h> --#include <asm/byteorder.h> --#define le16_to_cpu __le16_to_cpu -+#if defined(HAVE_ASM_BYTEORDER_H) -+# include <asm/byteorder.h> -+# define le16_to_cpu __le16_to_cpu -+#elif defined(HAVE_MACHINE_ENDIAN_H) -+# include <machine/endian.h> -+# ifdef WORDS_BIGENDIAN -+# define le16_to_cpu __bswap16 -+# else -+# define le16_to_cpu(x) (x) -+# endif -+#endif - #include <usb.h> - - /* NOTE: that should be <libusb.h> and it should include |