mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 14:46:31 +00:00
package/pcsc-lite: drop unneeded first patch
This patch is not needed as static build has been disabled since commit ad8c327053f3736881e1ef6d7b394b3a500ed8fa Moreover, pthread dependency should be correctly retrieved from libusb-1.0.pc Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
b9b081d53a
commit
5662244c9c
@ -1,29 +0,0 @@
|
|||||||
configure.ac: explicitly add pthread cflags/libs in the libusb test
|
|
||||||
|
|
||||||
If libusb-config does not exist, LIBUSB_CFLAGS and PTHREAD_CFLAGS will be
|
|
||||||
empty, and the test for libusb will be performed without additional flags.
|
|
||||||
However, when libusb needs threads, some extra flags are needed (depending
|
|
||||||
on the platform), like -pthreads, -lpthread, etc. Without these flags, the
|
|
||||||
test for libusb_init() will fail to link correctly, and pcsc-lite will fail
|
|
||||||
detecting libusb.
|
|
||||||
|
|
||||||
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
|
|
||||||
|
|
||||||
Upstream-status: will be submitted
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -254,8 +254,8 @@ if test "x$use_libusb" != xno ; then
|
|
||||||
saved_CPPFLAGS="$CPPFLAGS"
|
|
||||||
saved_LIBS="$LIBS"
|
|
||||||
|
|
||||||
- CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS"
|
|
||||||
- LIBS="$LDFLAGS $LIBUSB_LIBS"
|
|
||||||
+ CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS $PTHREAD_CFLAGS"
|
|
||||||
+ LIBS="$LDFLAGS $LIBUSB_LIBS $PTHREAD_LIBS"
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS(libusb.h, [],
|
|
||||||
[ AC_MSG_ERROR([libusb.h not found, use ./configure LIBUSB_CFLAGS=...]) ])
|
|
Loading…
x
Reference in New Issue
Block a user