| Message ID | 20211206090820.1009099-1-jacob.kroon@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe] Revert "ccid: Fix floating runtime dependency on flex" | expand |
On 12/6/21 10:08, Jacob Kroon wrote: > With the switch to recipe-specific sysroots this patch is no longer > needed. Tested building with and without the patch and the resulting > binaries are identical. > > This reverts commit 960314be5d854212ee65604a68a92a3616b2a544. > > Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> > --- > .../ccid/ccid/no-dep-on-libfl.patch | 18 ------------------ > meta-oe/recipes-support/ccid/ccid_1.4.33.bb | 1 - > 2 files changed, 19 deletions(-) > delete mode 100644 meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch > > 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 477cc31ad..000000000 > --- a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch > +++ /dev/null > @@ -1,18 +0,0 @@ > -No need to link with libfl. > - > -Upstream-Status: Pending > -Signed-off-by: Jacob Kroon <jacob.kroon@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.33.bb b/meta-oe/recipes-support/ccid/ccid_1.4.33.bb > index 4b1c42173..e3cb7cef1 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" > RDEPENDS:${PN} = "pcsc-lite" > > SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ > - file://no-dep-on-libfl.patch \ > file://0001-Add-build-rule-for-README.patch \ > " > > ping
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 477cc31ad..000000000 --- a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch +++ /dev/null @@ -1,18 +0,0 @@ -No need to link with libfl. - -Upstream-Status: Pending -Signed-off-by: Jacob Kroon <jacob.kroon@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.33.bb b/meta-oe/recipes-support/ccid/ccid_1.4.33.bb index 4b1c42173..e3cb7cef1 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" RDEPENDS:${PN} = "pcsc-lite" SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ - file://no-dep-on-libfl.patch \ file://0001-Add-build-rule-for-README.patch \ "
With the switch to recipe-specific sysroots this patch is no longer needed. Tested building with and without the patch and the resulting binaries are identical. This reverts commit 960314be5d854212ee65604a68a92a3616b2a544. Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> --- .../ccid/ccid/no-dep-on-libfl.patch | 18 ------------------ meta-oe/recipes-support/ccid/ccid_1.4.33.bb | 1 - 2 files changed, 19 deletions(-) delete mode 100644 meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch