1 |
commit: 922639c43726d0ffd0c11371e554d6b817ceee60 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 5 13:52:06 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 5 18:51:47 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922639c4 |
7 |
|
8 |
dev-libs/openct: Fix for slibtool |
9 |
|
10 |
Thanks-to: orbea <orbea <AT> riseup.net> |
11 |
Upstream: https://github.com/OpenSC/openct/commit/86abf3c |
12 |
Upstream: https://github.com/OpenSC/openct/commit/f329c26 |
13 |
Closes: https://bugs.gentoo.org/780033 |
14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
15 |
|
16 |
dev-libs/openct/files/openct-0.6.20-automake.patch | 24 +++++++++++++++ |
17 |
dev-libs/openct/files/openct-0.6.20-slibtool.patch | 34 ++++++++++++++++++++++ |
18 |
dev-libs/openct/openct-0.6.20-r4.ebuild | 12 +++++++- |
19 |
dev-libs/openct/openct-0.6.20-r5.ebuild | 12 +++++++- |
20 |
4 files changed, 80 insertions(+), 2 deletions(-) |
21 |
|
22 |
diff --git a/dev-libs/openct/files/openct-0.6.20-automake.patch b/dev-libs/openct/files/openct-0.6.20-automake.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..451af6a8a50 |
25 |
--- /dev/null |
26 |
+++ b/dev-libs/openct/files/openct-0.6.20-automake.patch |
27 |
@@ -0,0 +1,24 @@ |
28 |
+From 86abf3cbddbdc590dbb2ff5b0bda263e42595b88 Mon Sep 17 00:00:00 2001 |
29 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
30 |
+Date: Wed, 10 Oct 2012 08:48:02 +0000 |
31 |
+Subject: [PATCH] build: fix issue with latest automake |
32 |
+ |
33 |
+--- |
34 |
+ etc/Makefile.am | 4 ++-- |
35 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
36 |
+ |
37 |
+diff --git a/etc/Makefile.am b/etc/Makefile.am |
38 |
+index ff66d4e..dc00f47 100644 |
39 |
+--- a/etc/Makefile.am |
40 |
++++ b/etc/Makefile.am |
41 |
+@@ -30,8 +30,8 @@ dist_noinst_DATA += openct.usermap |
42 |
+ endif |
43 |
+ |
44 |
+ |
45 |
+-sysconf_DATA=#required in order to create dir |
46 |
+-install-exec-hook: install-sysconfDATA openct.conf |
47 |
++install-exec-hook: openct.conf |
48 |
++ $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" |
49 |
+ if [ -f "$(DESTDIR)$(sysconfdir)/openct.conf" ]; then \ |
50 |
+ $(INSTALL_DATA) openct.conf "$(DESTDIR)$(sysconfdir)/openct.conf.new"; \ |
51 |
+ else \ |
52 |
|
53 |
diff --git a/dev-libs/openct/files/openct-0.6.20-slibtool.patch b/dev-libs/openct/files/openct-0.6.20-slibtool.patch |
54 |
new file mode 100644 |
55 |
index 00000000000..0c0af2e1bd9 |
56 |
--- /dev/null |
57 |
+++ b/dev-libs/openct/files/openct-0.6.20-slibtool.patch |
58 |
@@ -0,0 +1,34 @@ |
59 |
+From f329c2663bde748d4a8fc462a1ea7bbc4ab47b36 Mon Sep 17 00:00:00 2001 |
60 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
61 |
+Date: Fri, 27 Sep 2013 23:27:24 +0300 |
62 |
+Subject: [PATCH] build: use newer libtool -shared option |
63 |
+ |
64 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
65 |
+--- |
66 |
+ src/ctapi/Makefile.am | 2 +- |
67 |
+ src/pcsc/Makefile.am | 2 +- |
68 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
69 |
+ |
70 |
+diff --git a/src/ctapi/Makefile.am b/src/ctapi/Makefile.am |
71 |
+index 25627a3..c837820 100644 |
72 |
+--- a/src/ctapi/Makefile.am |
73 |
++++ b/src/ctapi/Makefile.am |
74 |
+@@ -8,4 +8,4 @@ libopenctapi_la_LIBADD = $(top_builddir)/src/ct/libopenct.la |
75 |
+ libopenctapi_la_CFLAGS = $(AM_CFLAGS) \ |
76 |
+ -I$(top_srcdir)/src/include \ |
77 |
+ -I$(top_builddir)/src/include |
78 |
+-libopenctapi_la_LDFLAGS = -avoid-version -no-undefined --module |
79 |
++libopenctapi_la_LDFLAGS = -avoid-version -no-undefined -module -shared |
80 |
+diff --git a/src/pcsc/Makefile.am b/src/pcsc/Makefile.am |
81 |
+index 9986621..6aff8b8 100644 |
82 |
+--- a/src/pcsc/Makefile.am |
83 |
++++ b/src/pcsc/Makefile.am |
84 |
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES = openct-ifd.la |
85 |
+ endif |
86 |
+ |
87 |
+ openct_ifd_la_SOURCES = pcsc.c |
88 |
+-openct_ifd_la_LDFLAGS = -module -avoid-version -no-undefined |
89 |
++openct_ifd_la_LDFLAGS = -module -shared -avoid-version -no-undefined |
90 |
+ openct_ifd_la_LIBADD = $(PCSC_LIBS) $(top_builddir)/src/ctapi/libopenctapi.la |
91 |
+ openct_ifd_la_CFLAGS = $(AM_CFLAGS) \ |
92 |
+ -I$(top_srcdir)/src/include \ |
93 |
|
94 |
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild |
95 |
index 7c44328e370..f73005a3763 100644 |
96 |
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild |
97 |
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild |
98 |
@@ -3,7 +3,7 @@ |
99 |
|
100 |
EAPI=7 |
101 |
|
102 |
-inherit flag-o-matic udev user |
103 |
+inherit autotools flag-o-matic udev user |
104 |
|
105 |
DESCRIPTION="library for accessing smart card terminals" |
106 |
HOMEPAGE="https://github.com/OpenSC/openct/wiki" |
107 |
@@ -21,11 +21,21 @@ RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) |
108 |
DEPEND="${RDEPEND}" |
109 |
BDEPEND="doc? ( app-doc/doxygen )" |
110 |
|
111 |
+PATCHES=( |
112 |
+ "${FILESDIR}"/${P}-automake.patch |
113 |
+ "${FILESDIR}"/${P}-slibtool.patch |
114 |
+) |
115 |
+ |
116 |
pkg_setup() { |
117 |
enewgroup openct |
118 |
enewuser openctd |
119 |
} |
120 |
|
121 |
+src_prepare() { |
122 |
+ default |
123 |
+ eautoreconf |
124 |
+} |
125 |
+ |
126 |
src_configure() { |
127 |
use debug && append-cppflags -DDEBUG_IFDH |
128 |
|
129 |
|
130 |
diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild |
131 |
index 12d4c000e8c..6183a18acb1 100644 |
132 |
--- a/dev-libs/openct/openct-0.6.20-r5.ebuild |
133 |
+++ b/dev-libs/openct/openct-0.6.20-r5.ebuild |
134 |
@@ -3,7 +3,7 @@ |
135 |
|
136 |
EAPI=7 |
137 |
|
138 |
-inherit flag-o-matic udev |
139 |
+inherit autotools flag-o-matic udev |
140 |
|
141 |
DESCRIPTION="library for accessing smart card terminals" |
142 |
HOMEPAGE="https://github.com/OpenSC/openct/wiki" |
143 |
@@ -27,6 +27,16 @@ RDEPEND=" |
144 |
" |
145 |
BDEPEND="doc? ( app-doc/doxygen )" |
146 |
|
147 |
+PATCHES=( |
148 |
+ "${FILESDIR}"/${P}-automake.patch |
149 |
+ "${FILESDIR}"/${P}-slibtool.patch |
150 |
+) |
151 |
+ |
152 |
+src_prepare() { |
153 |
+ default |
154 |
+ eautoreconf |
155 |
+} |
156 |
+ |
157 |
src_configure() { |
158 |
use debug && append-cppflags -DDEBUG_IFDH |