[Pkg-bitcoin-commits] [cgminer] 01/01: Link against -lusb for kfreebsd* archs

[Scott Sheridan Howard]

This is an automated email from the git hooks/post-receive script.

showard pushed a commit to branch master
in repository cgminer.

commit 05cd7e4b6dcc00689c6b88e401141f0e6dd56e88
Author: Scott Howard <showard314 at gmail.com>
Date:   Wed Sep 11 13:34:00 2013 -0400

    Link against -lusb for kfreebsd* archs
---
 debian/changelog                   |    6 ++++++
 debian/patches/system_libusb.patch |   19 ++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd65de7..d0f88fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cgminer (3.4.2-2) unstable; urgency=low
+
+  * Link against -lusb for kfreebsd* archs
+
+ -- Scott Howard <showard at debian.org>  Wed, 11 Sep 2013 13:32:32 -0400
+
 cgminer (3.4.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/system_libusb.patch b/debian/patches/system_libusb.patch
index 3ae5e04..50dbdc6 100644
--- a/debian/patches/system_libusb.patch
+++ b/debian/patches/system_libusb.patch
@@ -3,20 +3,29 @@ Author: Scott Howard <showard at debian.org>
 Index: cgminer-3.4.2/configure.ac
 ===================================================================
 --- cgminer-3.4.2.orig/configure.ac	2013-09-10 14:52:55.245878478 -0400
-+++ cgminer-3.4.2/configure.ac	2013-09-10 14:53:22.381879123 -0400
-@@ -320,10 +320,9 @@
++++ cgminer-3.4.2/configure.ac	2013-09-11 13:25:25.759923177 -0400
+@@ -320,10 +320,17 @@
  AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
  AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
  
 -AC_CONFIG_SUBDIRS([compat/libusb-1.0])
  if test "x$want_usbutils" != xfalse; then
- 	AC_DEFINE([USE_USBUTILS], [1], [Defined to 1 if usbutils support required])
+-	AC_DEFINE([USE_USBUTILS], [1], [Defined to 1 if usbutils support required])
 -	LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"
-+	LIBUSB_LIBS="-lusb-1.0"
++    AC_DEFINE([USE_USBUTILS], [1], [Defined to 1 if usbutils support required])  
++    case $target in
++        *-*-freebsd*)
++          LIBUSB_LIBS="-lusb"
++          AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])
++          ;;
++        *)
++          PKG_CHECK_MODULES(LIBUSB, libusb-1.0, [AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])], [AC_MSG_ERROR([Could not find usb library - please install libusb-1.0])])
++          ;;
++      esac 
  	if test "x$have_linux" = "xtrue"; then
  		PKG_CHECK_MODULES([UDEV], [libudev], LIBUSB_LIBS+=" -ludev", [AC_MSG_ERROR([Missing required libudev dev])])
  	fi
-@@ -331,7 +330,7 @@
+@@ -331,7 +338,7 @@
  	LIBUSB_LIBS=""
  fi
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/cgminer.git