cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove -pthread patch and add libusb1 as static dependency, from Brad

Browse Source 
ok ajacoutot@
This commit is contained in:
mpi 2012-08-25 15:27:40 +00:00
parent 00095af6da
commit 1a37f49f5d
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/libusb-compat/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2012/05/09 09:43:07 mpi Exp $
# $OpenBSD: Makefile,v 1.3 2012/08/25 15:27:40 mpi Exp $
COMMENT= libusb-0.1 compatibility layer for libusb1
DISTNAME= libusb-compat-0.1.4
REVISION= 0
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS += usb 10.0 # 8.4
@ -21,7 +22,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += usb-1.0
WANTLIB += pthread usb-1.0
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/}

10
devel/libusb-compat/patches/patch-libusb-config_in
View File

@ -1,10 +0,0 @@
$OpenBSD: patch-libusb-config_in,v 1.1.1.1 2011/11/13 13:49:50 ajacoutot Exp $
--- libusb-config.in.orig Sat Nov 12 23:00:38 2011
+++ libusb-config.in Sat Nov 12 23:00:47 2011
@@ -77,5 +77,5 @@ if test "$echo_cflags" = "yes"; then
echo $includes
fi
if test "$echo_libs" = "yes"; then
- echo -L$libdir -lusb
+ echo -L$libdir -lusb -pthread
fi

15
devel/libusb-compat/patches/patch-libusb_pc_in
View File

@ -1,11 +1,14 @@
$OpenBSD: patch-libusb_pc_in,v 1.1.1.1 2011/11/13 13:49:50 ajacoutot Exp $
--- libusb.pc.in.orig Wed Jun 18 01:13:02 2008
+++ libusb.pc.in Sat Nov 12 23:17:16 2011
@@ -9,6 +9,6 @@ emulated_by=libusb-1.0
$OpenBSD: patch-libusb_pc_in,v 1.2 2012/08/25 15:27:40 mpi Exp $
Add missing libusb-1.0 libraries when static linking libusb-compat.
--- libusb.pc.in.orig Thu Jul 29 08:23:48 2010
+++ libusb.pc.in Tue Aug 21 03:49:05 2012
@@ -9,6 +9,7 @@ emulated_by=libusb-1.0
Name: libusb
Description: USB access library (libusb-1.0 compat wrapper)
Version: @LIBUSB01_VERSION@
-Libs: -L${libdir} -lusb
+Libs: -L${libdir} -lusb -pthread
+Requires.private: libusb-1.0
Libs: -L${libdir} -lusb
Cflags: -I${includedir}