[oe-commits] Jacob Kroon : ccid: Fix floating runtime dependency on flex

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 3d8ca069f2dbbadba7238f111d0dce687f7d884f
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=3d8ca069f2dbbadba7238f111d0dce687f7d884f

Author: Jacob Kroon <jacob.kroon at mikrodidakt.se>
Date:   Sun Jul 20 12:41:53 2014 +0200

ccid: Fix floating runtime dependency on flex

Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-support/ccid/ccid/no-dep-on-libfl.patch    | 18 ++++++++++++++++++
 meta-oe/recipes-support/ccid/ccid_1.4.8.bb             |  4 +++-
 2 files changed, 21 insertions(+), 1 deletion(-)

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 0000000..477cc31
--- /dev/null
+++ b/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch
@@ -0,0 +1,18 @@
+No need to link with libfl.
+
+Upstream-Status: Pending
+Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
+
+Index: ccid-1.4.8/src/Makefile.am
+===================================================================
+--- ccid-1.4.8.orig/src/Makefile.am
++++ ccid-1.4.8/src/Makefile.am
+@@ -53,7 +53,7 @@ PROVIDED_BY_PCSC = debug.c
+ endif
+ 
+ libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(PROVIDED_BY_PCSC) $(T1)
+-libccid_la_LIBADD = $(LEXLIB) $(LIBUSB_LIBS) $(PTHREAD_LIBS)
++libccid_la_LIBADD = $(LIBUSB_LIBS) $(PTHREAD_LIBS)
+ libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS) \
+ 	$(SYMBOL_VISIBILITY) -D$(CCID_VERSION) -DSIMCLIST_NO_DUMPRESTORE
+ 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 14f8875..078f785 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"
 DEPENDS = "virtual/libusb0 pcsc-lite"
 RDEPENDS_${PN} = "pcsc-lite"
 
-SRC_URI = "https://alioth.debian.org/frs/download.php/file/3768/ccid-${PV}.tar.bz2"
+SRC_URI = "https://alioth.debian.org/frs/download.php/file/3768/ccid-${PV}.tar.bz2 \
+           file://no-dep-on-libfl.patch"
+
 SRC_URI[md5sum] = "b6c37110f50b059a8ba94f118cfd679a"
 SRC_URI[sha256sum] = "7aca09fa4b9099e423402fd5df424adbafa502888710d1fda6015b6c1ff637ef"