diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-apps/pcsc-slb-rf72-drv | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'sys-apps/pcsc-slb-rf72-drv')
3 files changed, 7 insertions, 15 deletions
diff --git a/sys-apps/pcsc-slb-rf72-drv/Manifest b/sys-apps/pcsc-slb-rf72-drv/Manifest index 2c56d92c13ce..ed9520c61af2 100644 --- a/sys-apps/pcsc-slb-rf72-drv/Manifest +++ b/sys-apps/pcsc-slb-rf72-drv/Manifest @@ -1,5 +1,5 @@ -AUX pcsc-slb-rf72-drv-1.1.0-openct.patch 1211 BLAKE2B bc4e93838809a3782d3a7dd8ce325a807057e27ea78fb05a1da827be89b02ea75b86617bd2a4dc3399f783750fb3b1f0fdb27403aeb2f87b463cce4c6b2a7964 SHA512 c2191b78d507d59c0b4d8ab211eac37c0d7205aa9078dc9105129d0dc658a2fb94126cc862e60772272a314726d955e8f8c1d851fd649cfd27c3c48e65e65aba +AUX pcsc-slb-rf72-drv-1.1.0-openct.patch 984 BLAKE2B 12d85da9c10fec5e7088519f91f715ec1244392a35aa5051fa99c043e40392447456ffcdbc7d3e200dcc3d08416c825f1557028e3db75ec7db570f20376f1864 SHA512 ed99d37e69a52eafc091a4766109b860cddaa170fe7e4359a4da8dbeb10843a6314e4890b528649f09fd8f6b4448d222c0396d70b2d610dabdcef36b019e88ea AUX reader.conf 275 BLAKE2B f59922513d20a8b79e8c74a2cd55523b7ac488f76da5932971670060f78e1ff6613ef5c6bed64ea80c4b9514d3034de3ac4f83782bc46d1e2dea71ecdc523c98 SHA512 8c7de2c3504b23ec27b3437e1b321a23dd87db9fef51ead002a8c5b3c569e713e36cebe06a40071c95508568712f10f3b42609d6adb6254f63acf8ecef79f32e DIST slb_rf72-drv-1.1.0.tar.gz 53110 BLAKE2B f5ff955ca7dda46d792a0595de8ede4559926014874a1b79183e3a7a311e79784d98bee71f45d701f18fafcc561669eced8b090ad1a0d38c5102ecec92f59ba1 SHA512 93fd5dc9e38d89a0ae3f8c5adcdf2b4cefd8caabf7cac0e0551795b8b4190031ae7c7e30962dc90c6e8c5fcec6db99d4d14f00b8a7787ec043e366ef344ebd9e -EBUILD pcsc-slb-rf72-drv-1.1.0-r2.ebuild 1521 BLAKE2B c38a257cdd106ddc6b53c4de4b0b12fb4558bcc54e8ed4942909cb1fbd129a4cfd452370264a74b7d913bdc149d9846f1d81b9e298be0eac3932408736d4f65a SHA512 e146786e9d41c9dce890e047783f5a7d24ac00aabce478bde56c2e6a541454b0c352fd013ab4c2233693fe1af0bfb06854232cab7b5c42bdc6781a75f6f69e1b +EBUILD pcsc-slb-rf72-drv-1.1.0-r2.ebuild 1552 BLAKE2B 824ede585db2af69424a79853bc8cd353b3ed994ce79445a8b7037f6df6d28d109a86bc7a5494b4b1beb414ee864d2660d1bf090b1b84288e0c15ec8aee1433d SHA512 58f27a2de9cb73eecf8171b7128a56bd37b9b78ee50247cd2952864b24c28dc723603fb4deb81dab1f613ee3d5f402c336fbb1dcbc9171b6b51574d4fd12c101 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-openct.patch b/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-openct.patch index c7ddb87a5a7f..03e0a9589c98 100644 --- a/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-openct.patch +++ b/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-openct.patch @@ -4,13 +4,6 @@ Date: Fri, 17 Jun 2016 18:58:05 +0300 Subject: [PATCH] build: use openct instead of embedded binary ctapi Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> ---- - Makefile | 4 ++-- - ifdhandler.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index cdba2b6..319449a 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ clean: @@ -18,13 +11,11 @@ index cdba2b6..319449a 100644 lib: $(OBJ) - $(LD) -G ifdhandler.o lib/libctapi.a -o libslb_rf72.so -+ $(CC) $(LDFLAGS) -shared `pkg-config --libs-only-L libopenct` -lopenctapi ifdhandler.o -o libslb_rf72.so ++ $(CC) $(LDFLAGS) -shared `${PKG_CONFIG} --libs-only-L libopenct` -lopenctapi ifdhandler.o -o libslb_rf72.so ifdhandler.o: ifdhandler.h ifdhandler.c - $(CC) $(CFLAGS) -c ifdhandler.c $(INCLUDES) -+ $(CC) $(CFLAGS) `pkg-config --cflags libopenct` -fPIC -DHAVE_PTHREAD_H -c ifdhandler.c $(INCLUDES) -diff --git a/ifdhandler.c b/ifdhandler.c -index cbb3a65..256605e 100644 ++ $(CC) $(CFLAGS) `${PKG_CONFIG} --cflags libopenct` -fPIC -DHAVE_PTHREAD_H -c ifdhandler.c $(INCLUDES) --- a/ifdhandler.c +++ b/ifdhandler.c @@ -29,7 +29,7 @@ diff --git a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild index 39b7d34cb31a..6f8c631b16db 100644 --- a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild +++ b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,11 +29,12 @@ PATCHES=( ) src_compile() { + tc-export PKG_CONFIG emake CC="$(tc-getCC)" LD="$(tc-getLD)" } src_install() { - local pcscdir="$(pkg-config --variable=usbdropdir libpcsclite)" + local pcscdir="$($(tc-getPKG_CONFIG) --variable=usbdropdir libpcsclite)" local conf="/etc/reader.conf.d/${PN}.conf" einstalldocs |