summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-04-25 18:02:09 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-04-25 18:02:09 +0000
commitd27dcf7cd27e8eb2cc5e1aa1e9243b41ca539b49 (patch)
treef0c2b03da282f66bb52520bd4f316442b796dec6 /sys-apps/usbutils
parentRenamed existing patches (diff)
downloadgentoo-2-d27dcf7cd27e8eb2cc5e1aa1e9243b41ca539b49.tar.gz
gentoo-2-d27dcf7cd27e8eb2cc5e1aa1e9243b41ca539b49.tar.bz2
gentoo-2-d27dcf7cd27e8eb2cc5e1aa1e9243b41ca539b49.zip
Fix build on FreeBSD, bug #316671, by Toffanin [Gentoo/FreeBSD AT] <toffanin.mauro@gmail.com>
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/usbutils')
-rw-r--r--sys-apps/usbutils/ChangeLog7
-rw-r--r--sys-apps/usbutils/files/usbutils-0.87-fbsd.patch27
-rw-r--r--sys-apps/usbutils/usbutils-0.87.ebuild9
3 files changed, 38 insertions, 5 deletions
diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index 800469a2669e..e66c4d03b15f 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/usbutils
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.98 2010/03/21 18:04:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.99 2010/04/25 18:02:09 aballier Exp $
+
+ 25 Apr 2010; Alexis Ballier <aballier@gentoo.org> usbutils-0.87.ebuild,
+ +files/usbutils-0.87-fbsd.patch:
+ Fix build on FreeBSD, bug #316671, by Toffanin [Gentoo/FreeBSD AT]
+ <toffanin.mauro@gmail.com>
*usbutils-0.87 (21 Mar 2010)
diff --git a/sys-apps/usbutils/files/usbutils-0.87-fbsd.patch b/sys-apps/usbutils/files/usbutils-0.87-fbsd.patch
new file mode 100644
index 000000000000..7ec550d1438f
--- /dev/null
+++ b/sys-apps/usbutils/files/usbutils-0.87-fbsd.patch
@@ -0,0 +1,27 @@
+--- usbutils-0.87/configure.ac
++++ usbutils-0.87/configure.ac
+@@ -34,6 +34,8 @@
+ Makefile
+ ])
+
++AC_CHECK_HEADERS([byteswap.h])
++
+ AC_OUTPUT
+ AC_MSG_RESULT([
+ usbutils $VERSION
+--- usbutils-0.87/lsusb.c
++++ usbutils-0.87/lsusb.c
+@@ -32,8 +32,13 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++
++#ifdef HAVE_BYTESWAP_H
+ #include <byteswap.h>
++#endif
++
+ #include <usb.h>
++#include <unistd.h>
+
+ #include "names.h"
+ #include "devtree.h"
diff --git a/sys-apps/usbutils/usbutils-0.87.ebuild b/sys-apps/usbutils/usbutils-0.87.ebuild
index 1e3785a26696..79ace25ba7fc 100644
--- a/sys-apps/usbutils/usbutils-0.87.ebuild
+++ b/sys-apps/usbutils/usbutils-0.87.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.87.ebuild,v 1.1 2010/03/21 18:04:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.87.ebuild,v 1.2 2010/04/25 18:02:09 aballier Exp $
EAPI="2"
-inherit eutils
+inherit eutils autotools
DESCRIPTION="USB enumeration utilities"
HOMEPAGE="http://linux-usb.sourceforge.net/"
@@ -21,8 +21,9 @@ DEPEND="${DEPEND}
dev-util/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.82-fbsd.patch #275052
- sed -i '/^pkgconfigdir/s:datadir:datarootdir:' Makefile.in #287206
+ epatch "${FILESDIR}"/${PN}-0.87-fbsd.patch #275052 #316671
+ sed -i '/^pkgconfigdir/s:datadir:datarootdir:' Makefile.am #287206
+ eautoreconf
}
src_configure() {