File 0001-use-system-libhidapi.patch of Package u2f-utils

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-use-system-libhidapi.patch of Package u2f-utils

From 06dadc34559d17711e256dd0e479a6df505342d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
Date: Mon, 19 Jan 2015 15:42:18 +0100
Subject: [PATCH 1/5] use system libhidapi

---
 Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index fe7c1ef..0379927 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,14 @@ CFLAGS+=-fPIC -c -O2
 ifeq ($(UNAME), Linux)
 LDFLAGS+=-Wl,-soname=pam_fido-u2f.so
 
+HIDAPI_LIBS="$(pkg-config --libs hidapi-libusb hidapi-hidraw)"
+HIDAPI_CFLAGS="$(pkg-config --cflags hidapi-libusb hidapi-hidraw)"
 CFLAGS+=-Wall
-CFLAGS+=-Ihidapi/hidapi -D__OS_LINUX
+CFLAGS+=$(HIDAPI_CFLAGS) -D__OS_LINUX
 
-HIDAPI=hid.o
-hid.o: hidapi/linux/hid.c
-	$(CC) $(CFLAGS) -o hid.o hidapi/linux/hid.c
+#	HIDAPI=hid.o
+#	hid.o: hidapi/linux/hid.c
+#		$(CC) $(CFLAGS) -o hid.o hidapi/linux/hid.c
 
 endif  # Linux
 
@@ -52,11 +54,11 @@ enroll.o: enroll.cc
 sign.o: sign.cc
 	$(CXX) $(CFLAGS) $<
 
-u2f-enroll: enroll.o u2f_util.o $(HIDAPI)
-	$(CXX) $(LDFLAGS) -lrt -ludev -o $@ $^
+u2f-enroll: enroll.o u2f_util.o
+	$(CXX) $(LDFLAGS) -lrt -ludev $(HIDAPI_LIBS) -o $@ $^
 
-u2f-sign: sign.o u2f_util.o $(HIDAPI)
-	$(CXX) $(LDFLAGS) -lrt -ludev -o $@ $^
+u2f-sign: sign.o u2f_util.o
+	$(CXX) $(LDFLAGS) -lrt -ludev $(HIDAPI_LIBS) -o $@ $^
 
 
 install:
-- 
2.1.2

Places

File 0001-use-system-libhidapi.patch of Package u2f-utils

Places