da62d7b7a0
Some change in base broke compilation with libusb and this package. From looking at it more carefully, it turns out that the libusb patch needs to be updated so that host paths are not used. libusb-compat also depends on libusb, which increases the overall installed size. Refreshed patches with make package/hplip/refresh . Signed-off-by: Rosen Penev <rosenp@gmail.com>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -110,7 +110,7 @@ libhpmud_la_SOURCES += io/hpmud/musb_lib
|
|
libhpmud_la_LDFLAGS += -lusb
|
|
else
|
|
libhpmud_la_SOURCES += io/hpmud/musb.c
|
|
-libhpmud_la_CFLAGS += -I/usr/include/libusb-1.0
|
|
+libhpmud_la_CFLAGS += ${LIBUSB_1_0_CFLAGS}
|
|
libhpmud_la_LDFLAGS += -lusb-1.0
|
|
endif
|
|
|
|
@@ -363,7 +363,7 @@ hpmudext_la_CFLAGS += -Iprotocol/discove
|
|
endif
|
|
|
|
if !LIBUSB01_BUILD
|
|
-hpmudext_la_CFLAGS +=-I/usr/include/libusb-1.0
|
|
+hpmudext_la_CFLAGS += ${LIBUSB_1_0_CFLAGS}
|
|
endif
|
|
endif #!HPLIP_CLASS_DRIVER
|
|
# ui (qt3)
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -601,6 +601,10 @@ if test "$class_driver" = "no" && test "
|
|
else
|
|
AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)])
|
|
AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)])
|
|
+ PKG_CHECK_MODULES(LIBUSB_1_0, [ libusb-1.0 >= 1.0.0 ], have_libusb_1_0=yes, have_libusb_1_0=no)
|
|
+ if test "$have_libusb_1_0" = "yes"; then
|
|
+ CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS"
|
|
+ fi
|
|
fi
|
|
fi
|
|
|