summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch18
-rw-r--r--meta-oe/recipes-support/ccid/ccid_1.4.8.bb4
2 files changed, 21 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch b/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch
new file mode 100644
index 0000000000..477cc31ad2
--- /dev/null
+++ b/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch
@@ -0,0 +1,18 @@
1No need to link with libfl.
2
3Upstream-Status: Pending
4Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
5
6Index: ccid-1.4.8/src/Makefile.am
7===================================================================
8--- ccid-1.4.8.orig/src/Makefile.am
9+++ ccid-1.4.8/src/Makefile.am
10@@ -53,7 +53,7 @@ PROVIDED_BY_PCSC = debug.c
11 endif
12
13 libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(PROVIDED_BY_PCSC) $(T1)
14-libccid_la_LIBADD = $(LEXLIB) $(LIBUSB_LIBS) $(PTHREAD_LIBS)
15+libccid_la_LIBADD = $(LIBUSB_LIBS) $(PTHREAD_LIBS)
16 libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS) \
17 $(SYMBOL_VISIBILITY) -D$(CCID_VERSION) -DSIMCLIST_NO_DUMPRESTORE
18 libccid_la_LDFLAGS = -avoid-version
diff --git a/meta-oe/recipes-support/ccid/ccid_1.4.8.bb b/meta-oe/recipes-support/ccid/ccid_1.4.8.bb
index 14f88755fb..078f785aba 100644
--- a/meta-oe/recipes-support/ccid/ccid_1.4.8.bb
+++ b/meta-oe/recipes-support/ccid/ccid_1.4.8.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
6DEPENDS = "virtual/libusb0 pcsc-lite" 6DEPENDS = "virtual/libusb0 pcsc-lite"
7RDEPENDS_${PN} = "pcsc-lite" 7RDEPENDS_${PN} = "pcsc-lite"
8 8
9SRC_URI = "https://alioth.debian.org/frs/download.php/file/3768/ccid-${PV}.tar.bz2" 9SRC_URI = "https://alioth.debian.org/frs/download.php/file/3768/ccid-${PV}.tar.bz2 \
10 file://no-dep-on-libfl.patch"
11
10SRC_URI[md5sum] = "b6c37110f50b059a8ba94f118cfd679a" 12SRC_URI[md5sum] = "b6c37110f50b059a8ba94f118cfd679a"
11SRC_URI[sha256sum] = "7aca09fa4b9099e423402fd5df424adbafa502888710d1fda6015b6c1ff637ef" 13SRC_URI[sha256sum] = "7aca09fa4b9099e423402fd5df424adbafa502888710d1fda6015b6c1ff637ef"
12 14