1 files changed, 80 insertions, 0 deletions
diff --git a/system-jansson-libusb.patch b/system-jansson-libusb.patch
new file mode 100644
index 000000000000..5c261443e241
--- /dev/null
+++ b/system-jansson-libusb.patch
@@ -0,0 +1,80 @@
+diff --git a/Makefile.am b/Makefile.am
+index 05002bc..407c301 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,10 +1,10 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-JANSSON_INCLUDES= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src
++JANSSON_INCLUDES=
+ 
+ if WANT_USBUTILS
+-USBUTILS_INCLUDES = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb
++USBUTILS_INCLUDES = -I/usr/include/libusb-1.0
+ else
+ USBUTILS_INCLUDES =
+ endif
+@@ -16,7 +16,7 @@ EXTRA_DIST	= example.conf linux-usb-cgminer \
+ 		  bitforce-firmware-flash.c hexdump.c ASIC-README \
+ 		  01-cgminer.rules
+ 
+-SUBDIRS		= lib compat ccan
++SUBDIRS		= lib ccan
+ 
+ INCLUDES	= $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USBUTILS_INCLUDES)
+ 
+diff --git a/configure.ac b/configure.ac
+index 6553d23..f1bde1b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -273,14 +273,8 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
+ AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
+ 
+ if test "x$want_usbutils" != xfalse; then
+-	dlibusb="no"
+ 	AC_DEFINE([USE_USBUTILS], [1], [Defined to 1 if usbutils support required])
+-	AC_ARG_WITH([system-libusb],
+-		[AC_HELP_STRING([--with-system-libusb],[Compile against dynamic system libusb (default use included static libusb)])],
+-		[dlibusb=$withval]
+-	)
+ 
+-	if test "x$dlibusb" != xno; then
+ 		case $target in
+ 			*-*-freebsd*)
+ 				LIBUSB_LIBS="-lusb"
+@@ -291,25 +285,13 @@ if test "x$want_usbutils" != xfalse; then
+ 				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
+-	else
+-		AC_CONFIG_SUBDIRS([compat/libusb-1.0])
+-		LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"
+-		if test "x$have_linux" = "xtrue"; then
+-			LIBUSB_LIBS+=" -ludev"
+-		fi
+-		if test "x$have_darwin" = "xtrue"; then
+-			LIBUSB_LIBS+=" -lobjc"
+-			LDFLAGS+=" -framework CoreFoundation -framework IOKit"
+-		fi
+-	fi
+ else
+ 	LIBUSB_LIBS=""
+ fi
+ 
+ AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
+ 
+-AC_CONFIG_SUBDIRS([compat/jansson-2.5])
+-JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"
++JANSSON_LIBS=-ljansson
+ 
+ PKG_PROG_PKG_CONFIG()
+ 
+@@ -413,7 +395,6 @@ AC_SUBST(ADL_CPPFLAGS)
+ 
+ AC_CONFIG_FILES([
+ 	Makefile
+-	compat/Makefile
+ 	ccan/Makefile
+ 	lib/Makefile
+ 	])