[Glibc-bsd-commits] r4797 - in trunk/freebsd-libs/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2013-07-23 17:14:11 +0000 (Tue, 23 Jul 2013)
New Revision: 4797

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/libusb-1.0.pc
   trunk/freebsd-libs/debian/libusb.pc
   trunk/freebsd-libs/debian/patches/12_usb.diff
Log:
libusb really needs libbsd



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-07-23 16:20:33 UTC (rev 4796)
+++ trunk/freebsd-libs/debian/changelog	2013-07-23 17:14:11 UTC (rev 4797)
@@ -2,6 +2,7 @@
 
   [ Petr Salinger ]
   * extend cdefs_macros.diff in libusb.h part
+  * libusb really needs libbsd
 
  -- Robert Millan <rmh at debian.org>  Tue, 16 Jul 2013 15:24:27 +0200
 

Modified: trunk/freebsd-libs/debian/libusb-1.0.pc
===================================================================
--- trunk/freebsd-libs/debian/libusb-1.0.pc	2013-07-23 16:20:33 UTC (rev 4796)
+++ trunk/freebsd-libs/debian/libusb-1.0.pc	2013-07-23 17:14:11 UTC (rev 4797)
@@ -7,4 +7,5 @@
 Description: C API for USB device access from FreeBSD userspace
 Version: 1.0.6
 Libs: -L${libdir} -lusb
+Libs.private: -lbsd
 Cflags: -I${includedir}

Modified: trunk/freebsd-libs/debian/libusb.pc
===================================================================
--- trunk/freebsd-libs/debian/libusb.pc	2013-07-23 16:20:33 UTC (rev 4796)
+++ trunk/freebsd-libs/debian/libusb.pc	2013-07-23 17:14:11 UTC (rev 4797)
@@ -7,4 +7,5 @@
 Description: USB access library
 Version: 0.1.12
 Libs: -L${libdir} -lusb
+Libs.private: -lbsd
 Cflags: -I${includedir}

Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff	2013-07-23 16:20:33 UTC (rev 4796)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff	2013-07-23 17:14:11 UTC (rev 4797)
@@ -11,13 +11,14 @@
  
 --- a/lib/libusb/Makefile
 +++ b/lib/libusb/Makefile
-@@ -15,6 +15,7 @@
- MAN=		libusb.3 libusb20.3
- MKLINT=		no
- NOGCCERROR=
+@@ -19,7 +19,7 @@
+ WARNS?=		2
+ 
+ DPADD=		${LIBPTHREAD}
+-LDADD=		-lpthread
 +LDADD+=		-lpthread -lrt -lbsd
  
- WARNS?=		2
+ MLINKS+=	libusb.3 usb.3
  
 --- a/lib/libusb/libusb.h
 +++ b/lib/libusb/libusb.h