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.33.bb1
2 files changed, 0 insertions, 19 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
deleted file mode 100644
index 477cc31ad2..0000000000
--- a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
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.33.bb b/meta-oe/recipes-support/ccid/ccid_1.4.33.bb
index 4b1c421733..e3cb7cef19 100644
--- a/meta-oe/recipes-support/ccid/ccid_1.4.33.bb
+++ b/meta-oe/recipes-support/ccid/ccid_1.4.33.bb
@@ -7,7 +7,6 @@ DEPENDS = "virtual/libusb0 pcsc-lite"
7RDEPENDS:${PN} = "pcsc-lite" 7RDEPENDS:${PN} = "pcsc-lite"
8 8
9SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ 9SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \
10 file://no-dep-on-libfl.patch \
11 file://0001-Add-build-rule-for-README.patch \ 10 file://0001-Add-build-rule-for-README.patch \
12" 11"
13 12