1 |
commit: d4e5fb57ef9445c508d7e2778d71bd68264cdb76 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 28 20:16:05 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 28 20:24:06 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e5fb57 |
7 |
|
8 |
sci-mathematics/calc: add 2.13.0.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/732028 |
11 |
Closes: https://bugs.gentoo.org/725590 |
12 |
Closes: https://bugs.gentoo.org/620892 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
sci-mathematics/calc/Manifest | 1 + |
16 |
sci-mathematics/calc/calc-2.13.0.1.ebuild | 62 +++++ |
17 |
.../calc/files/calc-2.12.5.4-as-needed.patch | 4 +- |
18 |
.../calc/files/calc-2.13.0.1-RPATH.patch | 199 +++++++++++++++ |
19 |
.../calc/files/calc-2.13.0.1-respect-LDFLAGS.patch | 267 +++++++++++++++++++++ |
20 |
5 files changed, 531 insertions(+), 2 deletions(-) |
21 |
|
22 |
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest |
23 |
index 79765f5f29e..dce8694b801 100644 |
24 |
--- a/sci-mathematics/calc/Manifest |
25 |
+++ b/sci-mathematics/calc/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST calc-2.12.5.4.tar.bz2 956258 BLAKE2B 47c2ab46c47baf0d1f1d202a36e0d42cf0b25f7eecf61815814081b2f76aa65dc8cc4e970078a5176266ce1332751169424d1c6d2c16ff148a1b014986b56d47 SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f |
28 |
+DIST calc-2.13.0.1.tar.bz2 987542 BLAKE2B bbd93aa296211dde8f7d00a86e222bf4ccc0065da021c1666c333610c6837a1984995c74995571af025e68ec64519ed2d158731448037ee0a4f2eafccfc1a625 SHA512 7d7e07072779c97aaeb966f9282a6e4127c839ecadd0b7269d37d587949c47075d301c3420735f903ba179ae2bbbd309fd29e459fbf12b450e528aadc66537c4 |
29 |
|
30 |
diff --git a/sci-mathematics/calc/calc-2.13.0.1.ebuild b/sci-mathematics/calc/calc-2.13.0.1.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..955dc93fbea |
33 |
--- /dev/null |
34 |
+++ b/sci-mathematics/calc/calc-2.13.0.1.ebuild |
35 |
@@ -0,0 +1,62 @@ |
36 |
+# Copyright 1999-2021 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=7 |
40 |
+ |
41 |
+inherit toolchain-funcs |
42 |
+ |
43 |
+DESCRIPTION="Arbitrary precision C-like arithmetic system" |
44 |
+HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/" |
45 |
+SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2" |
46 |
+ |
47 |
+SLOT="0" |
48 |
+LICENSE="LGPL-2" |
49 |
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
50 |
+ |
51 |
+RDEPEND=" |
52 |
+ sys-libs/ncurses:0= |
53 |
+ sys-libs/readline:0=" |
54 |
+DEPEND="${RDEPEND}" |
55 |
+BDEPEND="virtual/pkgconfig" |
56 |
+ |
57 |
+PATCHES=( |
58 |
+ "${FILESDIR}"/${PN}-2.13.0.1-RPATH.patch |
59 |
+ "${FILESDIR}"/${PN}-2.13.0.1-respect-LDFLAGS.patch |
60 |
+) |
61 |
+ |
62 |
+src_prepare() { |
63 |
+ default |
64 |
+ |
65 |
+ ln -sf libcustcalc.so.${PV} custom/libcustcalc.so || die |
66 |
+ sed -i -e "/DIR/s:/usr:${EPREFIX}/usr:g" Makefile || die |
67 |
+} |
68 |
+ |
69 |
+src_compile() { |
70 |
+ # parallel compilation hard to fix. better to leave upstream. |
71 |
+ emake -j1 \ |
72 |
+ CC="$(tc-getCC)" \ |
73 |
+ DEBUG="${CFLAGS}" \ |
74 |
+ LDFLAGS="${LDFLAGS}" \ |
75 |
+ EXTRA_LDFLAGS="${LDFLAGS}" \ |
76 |
+ CALCPAGER="${PAGER}" \ |
77 |
+ USE_READLINE="-DUSE_READLINE" \ |
78 |
+ READLINE_LIB="-lreadline -lhistory $($(tc-getPKG_CONFIG) --libs ncurses) -L\"${S}\"/custom -lcustcalc" \ |
79 |
+ all |
80 |
+} |
81 |
+ |
82 |
+src_test() { |
83 |
+ if echo "${LD_PRELOAD}" | grep -q "sandbox"; then |
84 |
+ ewarn "Can't run check when running in sandbox - see bug #59676" |
85 |
+ else |
86 |
+ emake chk |
87 |
+ fi |
88 |
+} |
89 |
+ |
90 |
+src_install() { |
91 |
+ emake \ |
92 |
+ T="${D}" \ |
93 |
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
94 |
+ install |
95 |
+ |
96 |
+ dodoc BUGS CHANGES LIBRARY |
97 |
+} |
98 |
|
99 |
diff --git a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch |
100 |
index 3e7e03002ac..3dbb2cd1bf4 100644 |
101 |
--- a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch |
102 |
+++ b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch |
103 |
@@ -1,5 +1,5 @@ |
104 |
---- calc-2.12.5.3/Makefile |
105 |
-+++ calc-2.12.5.3/Makefile |
106 |
+--- a/Makefile |
107 |
++++ b/Makefile |
108 |
@@ -1136,14 +1136,14 @@ |
109 |
BLD_TYPE= calc-dynamic-only |
110 |
# |
111 |
|
112 |
diff --git a/sci-mathematics/calc/files/calc-2.13.0.1-RPATH.patch b/sci-mathematics/calc/files/calc-2.13.0.1-RPATH.patch |
113 |
new file mode 100644 |
114 |
index 00000000000..c7657a8b772 |
115 |
--- /dev/null |
116 |
+++ b/sci-mathematics/calc/files/calc-2.13.0.1-RPATH.patch |
117 |
@@ -0,0 +1,199 @@ |
118 |
+--- a/Makefile |
119 |
++++ b/Makefile |
120 |
+@@ -1384,9 +1384,6 @@ ifeq ($(target),Linux) |
121 |
+ BLD_TYPE= calc-dynamic-only |
122 |
+ # |
123 |
+ CC_SHARE= -fPIC |
124 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
125 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
126 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
127 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
128 |
+ ifdef ALLOW_CUSTOM |
129 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
130 |
+@@ -1436,7 +1433,6 @@ ifeq ($(target),Darwin) |
131 |
+ BLD_TYPE= calc-dynamic-only |
132 |
+ # |
133 |
+ CC_SHARE= -fPIC |
134 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib |
135 |
+ LD_SHARE= ${DARWIN_ARCH} |
136 |
+ #SET_INSTALL_NAME= no |
137 |
+ SET_INSTALL_NAME= yes |
138 |
+@@ -1518,9 +1514,6 @@ ifeq ($(target),FreeBSD) |
139 |
+ BLD_TYPE= calc-dynamic-only |
140 |
+ # |
141 |
+ CC_SHARE= -fPIC |
142 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
143 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
144 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
145 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
146 |
+ ifdef ALLOW_CUSTOM |
147 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
148 |
+@@ -1578,9 +1571,6 @@ ifeq ($(target),OpenBSD) |
149 |
+ BLD_TYPE= calc-dynamic-only |
150 |
+ # |
151 |
+ CC_SHARE= -fPIC |
152 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
153 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
154 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
155 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
156 |
+ ifdef ALLOW_CUSTOM |
157 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
158 |
+@@ -1632,9 +1622,6 @@ ifeq ($(target),SunOS) |
159 |
+ BLD_TYPE= calc-dynamic-only |
160 |
+ # |
161 |
+ CC_SHARE= -fPIC |
162 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
163 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
164 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
165 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
166 |
+ ifdef ALLOW_CUSTOM |
167 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
168 |
+@@ -1684,9 +1671,6 @@ ifeq ($(target),Cygwin) |
169 |
+ BLD_TYPE= calc-static-only |
170 |
+ # |
171 |
+ CC_SHARE= -fPIC |
172 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
173 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
174 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
175 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
176 |
+ ifdef ALLOW_CUSTOM |
177 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
178 |
+@@ -1740,9 +1724,6 @@ ifeq ($(target),simple) |
179 |
+ BLD_TYPE= calc-static-only |
180 |
+ # |
181 |
+ CC_SHARE= -fPIC |
182 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
183 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
184 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
185 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
186 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
187 |
+ # |
188 |
+@@ -1799,9 +1780,6 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit |
189 |
+ BLD_TYPE= calc-static-only |
190 |
+ # |
191 |
+ CC_SHARE= -fPIC |
192 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
193 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
194 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
195 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
196 |
+ ifdef ALLOW_CUSTOM |
197 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
198 |
+@@ -1839,9 +1817,6 @@ ifeq ($(target),) |
199 |
+ BLD_TYPE= calc-static-only |
200 |
+ # |
201 |
+ CC_SHARE= -fPIC |
202 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
203 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
204 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
205 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
206 |
+ ifdef ALLOW_CUSTOM |
207 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
208 |
+@@ -2115,7 +2090,6 @@ CUSTOM_PASSDOWN= \ |
209 |
+ CUSTOMHELPDIR="${CUSTOMHELPDIR}" \ |
210 |
+ CUSTOMINCDIR="${CUSTOMINCDIR}" \ |
211 |
+ DEBUG="${DEBUG}" \ |
212 |
+- DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \ |
213 |
+ E="${E}" \ |
214 |
+ FMT=${FMT} \ |
215 |
+ GREP=${GREP} \ |
216 |
+@@ -4510,7 +4484,6 @@ env: |
217 |
+ @echo 'C_SRC=${C_SRC}'; echo '' |
218 |
+ @echo 'DATE=${DATE}'; echo '' |
219 |
+ @echo 'DEBUG=${DEBUG}'; echo '' |
220 |
+- @echo 'DEFAULT_LIB_INSTALL_PATH=${DEFAULT_LIB_INSTALL_PATH}'; echo '' |
221 |
+ @echo 'DEV_BITS=${DEV_BITS}'; echo '' |
222 |
+ @echo 'DIFF=${DIFF}'; echo '' |
223 |
+ @echo 'DISTLIST=${DISTLIST}'; echo '' |
224 |
+--- a/custom/Makefile |
225 |
++++ b/custom/Makefile |
226 |
+@@ -667,9 +667,6 @@ ifeq ($(target),Linux) |
227 |
+ BLD_TYPE= calc-dynamic-only |
228 |
+ # |
229 |
+ CC_SHARE= -fPIC |
230 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
231 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
232 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
233 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
234 |
+ ifdef ALLOW_CUSTOM |
235 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
236 |
+@@ -719,7 +716,6 @@ ifeq ($(target),Darwin) |
237 |
+ BLD_TYPE= calc-dynamic-only |
238 |
+ # |
239 |
+ CC_SHARE= -fPIC |
240 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib |
241 |
+ LD_SHARE= ${DARWIN_ARCH} |
242 |
+ #SET_INSTALL_NAME= no |
243 |
+ SET_INSTALL_NAME= yes |
244 |
+@@ -801,9 +797,6 @@ ifeq ($(target),FreeBSD) |
245 |
+ BLD_TYPE= calc-dynamic-only |
246 |
+ # |
247 |
+ CC_SHARE= -fPIC |
248 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
249 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
250 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
251 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
252 |
+ ifdef ALLOW_CUSTOM |
253 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
254 |
+@@ -861,9 +854,6 @@ ifeq ($(target),OpenBSD) |
255 |
+ BLD_TYPE= calc-dynamic-only |
256 |
+ # |
257 |
+ CC_SHARE= -fPIC |
258 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
259 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
260 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
261 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
262 |
+ ifdef ALLOW_CUSTOM |
263 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
264 |
+@@ -915,9 +905,6 @@ ifeq ($(target),SunOS) |
265 |
+ BLD_TYPE= calc-dynamic-only |
266 |
+ # |
267 |
+ CC_SHARE= -fPIC |
268 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
269 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
270 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
271 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
272 |
+ ifdef ALLOW_CUSTOM |
273 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
274 |
+@@ -967,9 +954,6 @@ ifeq ($(target),Cygwin) |
275 |
+ BLD_TYPE= calc-static-only |
276 |
+ # |
277 |
+ CC_SHARE= -fPIC |
278 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
279 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
280 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
281 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
282 |
+ ifdef ALLOW_CUSTOM |
283 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
284 |
+@@ -1023,9 +1007,6 @@ ifeq ($(target),simple) |
285 |
+ BLD_TYPE= calc-static-only |
286 |
+ # |
287 |
+ CC_SHARE= -fPIC |
288 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
289 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
290 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
291 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
292 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
293 |
+ # |
294 |
+@@ -1082,9 +1063,6 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit |
295 |
+ BLD_TYPE= calc-static-only |
296 |
+ # |
297 |
+ CC_SHARE= -fPIC |
298 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
299 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
300 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
301 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
302 |
+ ifdef ALLOW_CUSTOM |
303 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
304 |
+@@ -1122,9 +1100,6 @@ ifeq ($(target),) |
305 |
+ BLD_TYPE= calc-static-only |
306 |
+ # |
307 |
+ CC_SHARE= -fPIC |
308 |
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib |
309 |
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ |
310 |
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" |
311 |
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" |
312 |
+ ifdef ALLOW_CUSTOM |
313 |
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" |
314 |
+-- |
315 |
+2.31.1 |
316 |
+ |
317 |
|
318 |
diff --git a/sci-mathematics/calc/files/calc-2.13.0.1-respect-LDFLAGS.patch b/sci-mathematics/calc/files/calc-2.13.0.1-respect-LDFLAGS.patch |
319 |
new file mode 100644 |
320 |
index 00000000000..971d20e7ef7 |
321 |
--- /dev/null |
322 |
+++ b/sci-mathematics/calc/files/calc-2.13.0.1-respect-LDFLAGS.patch |
323 |
@@ -0,0 +1,267 @@ |
324 |
+--- a/Makefile |
325 |
++++ b/Makefile |
326 |
+@@ -2541,11 +2541,11 @@ sample: ${SAMPLE_TARGETS} |
327 |
+ |
328 |
+ sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
329 |
+ ${CC} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
330 |
+- ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ |
331 |
++ ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@ |
332 |
+ |
333 |
+ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
334 |
+ ${CC} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
335 |
+- ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ |
336 |
++ ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@ |
337 |
+ |
338 |
+ ### |
339 |
+ # |
340 |
+@@ -2554,15 +2554,15 @@ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
341 |
+ ### |
342 |
+ |
343 |
+ hist.o: hist.c ${MAKE_FILE} ${LOC_MKF} |
344 |
+- ${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} \ |
345 |
++ ${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} ${LDFLAGS} \ |
346 |
+ -c hist.c |
347 |
+ |
348 |
+ seed.o: seed.c ${MAKE_FILE} ${LOC_MKF} |
349 |
+ ${CC} ${CFLAGS} ${WNO_IMPLICT} ${WNO_ERROR_LONG_LONG} \ |
350 |
+- ${WNO_LONG_LONG} -c seed.c |
351 |
++ ${WNO_LONG_LONG} ${LDFLAGS} -c seed.c |
352 |
+ |
353 |
+ file.o: file.c ${MAKE_FILE} ${LOC_MKF} |
354 |
+- ${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} -c file.c |
355 |
++ ${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} ${LDFLAGS} -c file.c |
356 |
+ |
357 |
+ ### |
358 |
+ # |
359 |
+@@ -4190,7 +4190,7 @@ depend: hsrc custom/Makefile |
360 |
+ ${Q} :> skel/makedep.out |
361 |
+ ${Q} cd skel; ${MAKEDEPEND} \ |
362 |
+ -w 1 -f makedep.out -- \ |
363 |
+- ${CFLAGS} -- \ |
364 |
++ ${CFLAGS} ${LDFLAGS} -- \ |
365 |
+ ${C_SRC} ${BUILD_C_SRC} 2>/dev/null |
366 |
+ -${Q} for i in ${C_SRC} ${BUILD_C_SRC} /dev/null; do \ |
367 |
+ if [ X"$$i" != X"/dev/null" ]; then \ |
368 |
+--- a/Makefile.simple |
369 |
++++ b/Makefile.simple |
370 |
+@@ -1941,12 +1941,12 @@ calc.usage: calc.1 ${MAKE_FILE} ${LOC_MKF} |
371 |
+ sample: ${SAMPLE_TARGETS} |
372 |
+ |
373 |
+ sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
374 |
+- ${CC} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
375 |
+- ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ |
376 |
++ ${CC} ${CFLAGS} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
377 |
++ ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@ |
378 |
+ |
379 |
+ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
380 |
+- ${CC} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
381 |
+- ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ |
382 |
++ ${CC} ${CFLAGS} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
383 |
++ ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@ |
384 |
+ |
385 |
+ ### |
386 |
+ # |
387 |
+@@ -1955,15 +1955,15 @@ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
388 |
+ ### |
389 |
+ |
390 |
+ hist.o: hist.c ${MAKE_FILE} ${LOC_MKF} |
391 |
+- ${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} \ |
392 |
++ ${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} ${LDFLAGS} \ |
393 |
+ -c hist.c |
394 |
+ |
395 |
+ seed.o: seed.c ${MAKE_FILE} ${LOC_MKF} |
396 |
+ ${CC} ${CFLAGS} ${WNO_IMPLICT} ${WNO_ERROR_LONG_LONG} \ |
397 |
+- ${WNO_LONG_LONG} -c seed.c |
398 |
++ ${WNO_LONG_LONG} ${LDFLAGS} -c seed.c |
399 |
+ |
400 |
+ file.o: file.c ${MAKE_FILE} ${LOC_MKF} |
401 |
+- ${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} -c file.c |
402 |
++ ${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} ${LDFLAGS} -c file.c |
403 |
+ |
404 |
+ ### |
405 |
+ # |
406 |
+@@ -3557,7 +3557,7 @@ depend: hsrc custom/Makefile |
407 |
+ ${Q} :> skel/makedep.out |
408 |
+ ${Q} cd skel; ${MAKEDEPEND} \ |
409 |
+ -w 1 -f makedep.out -- \ |
410 |
+- ${CFLAGS} -- \ |
411 |
++ ${CFLAGS} ${LDFLAGS} -- \ |
412 |
+ ${C_SRC} ${BUILD_C_SRC} 2>/dev/null |
413 |
+ -${Q} for i in ${C_SRC} ${BUILD_C_SRC} /dev/null; do \ |
414 |
+ if [ X"$$i" != X"/dev/null" ]; then \ |
415 |
+--- a/custom/Makefile |
416 |
++++ b/custom/Makefile |
417 |
+@@ -1280,7 +1280,7 @@ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE} |
418 |
+ ## |
419 |
+ |
420 |
+ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE} |
421 |
+- ${CC} ${CFLAGS} c_sysinfo.c -c |
422 |
++ ${CC} ${CFLAGS} ${LDFLAGS} c_sysinfo.c -c |
423 |
+ |
424 |
+ ## |
425 |
+ # |
426 |
+@@ -1407,7 +1407,7 @@ depend: |
427 |
+ ${Q} :> skel/custom/makedep.out |
428 |
+ ${Q} cd skel/custom; ${MAKEDEPEND} \ |
429 |
+ -I../../.. -w 1 -f makedep.out -- \ |
430 |
+- ${CFLAGS} -- \ |
431 |
++ ${CFLAGS} ${LDFLAGS} -- \ |
432 |
+ ${C_SRC} 2>/dev/null |
433 |
+ ${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out |
434 |
+ -${Q} for i in ${C_SRC} /dev/null; do \ |
435 |
+-- |
436 |
+2.31.1 |
437 |
+ |
438 |
+--- a/Makefile |
439 |
++++ b/Makefile |
440 |
+@@ -2487,12 +2487,12 @@ calc-static-only: ${STATIC_FIRST_TARGETS} ${EARLY_TARGETS} \ |
441 |
+ |
442 |
+ calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
443 |
+ ${RM} -f $@ |
444 |
+- ${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
445 |
++ ${CC} ${CPPFLAGS} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
446 |
+ ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ |
447 |
+ |
448 |
+ libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE} ${LOC_MKF} |
449 |
+- ${CC} ${LIBCALC_SHLIB} ${LIBOBJS} \ |
450 |
+- ${READLINE_LIB} ${READLINE_EXTRAS} -o libcalc${LIB_EXT_VERSION} |
451 |
++ ${CC} ${CPPFLAGS} ${LIBCALC_SHLIB} ${LIBOBJS} \ |
452 |
++ ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o libcalc${LIB_EXT_VERSION} |
453 |
+ |
454 |
+ libcalc${LIB_EXT}: libcalc${LIB_EXT_VERSION} |
455 |
+ ${Q} ${RM} -f $@ |
456 |
+@@ -2540,11 +2540,11 @@ calc.usage: calc.1 ${MAKE_FILE} ${LOC_MKF} |
457 |
+ sample: ${SAMPLE_TARGETS} |
458 |
+ |
459 |
+ sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
460 |
+- ${CC} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
461 |
++ ${CC} ${CPPFLAGS} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
462 |
+ ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@ |
463 |
+ |
464 |
+ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
465 |
+- ${CC} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
466 |
++ ${CC} ${CPPFLAGS} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ |
467 |
+ ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@ |
468 |
+ |
469 |
+ ### |
470 |
+@@ -2554,15 +2554,15 @@ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
471 |
+ ### |
472 |
+ |
473 |
+ hist.o: hist.c ${MAKE_FILE} ${LOC_MKF} |
474 |
+- ${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} ${LDFLAGS} \ |
475 |
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} ${LDFLAGS} \ |
476 |
+ -c hist.c |
477 |
+ |
478 |
+ seed.o: seed.c ${MAKE_FILE} ${LOC_MKF} |
479 |
+- ${CC} ${CFLAGS} ${WNO_IMPLICT} ${WNO_ERROR_LONG_LONG} \ |
480 |
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${WNO_IMPLICT} ${WNO_ERROR_LONG_LONG} \ |
481 |
+ ${WNO_LONG_LONG} ${LDFLAGS} -c seed.c |
482 |
+ |
483 |
+ file.o: file.c ${MAKE_FILE} ${LOC_MKF} |
484 |
+- ${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} ${LDFLAGS} -c file.c |
485 |
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} ${LDFLAGS} -c file.c |
486 |
+ |
487 |
+ ### |
488 |
+ # |
489 |
+@@ -4109,7 +4109,7 @@ endif |
490 |
+ calc-static${EXT}: .hsrc ${CALCOBJS} \ |
491 |
+ ${CALC_STATIC_LIBS} ${MAKE_FILE} ${LOC_MKF} |
492 |
+ ${RM} -f $@ |
493 |
+- ${CC} ${LDFLAGS} ${CALCOBJS} ${LD_STATIC} ${CALC_STATIC_LIBS} \ |
494 |
++ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CALCOBJS} ${LD_STATIC} ${CALC_STATIC_LIBS} \ |
495 |
+ ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ |
496 |
+ |
497 |
+ libcustcalc.a: custom/libcustcalc.a |
498 |
+@@ -4133,12 +4133,12 @@ endif |
499 |
+ |
500 |
+ sample_rand-static${EXT}: sample_rand.o ${CALC_STATIC_LIBS} \ |
501 |
+ ${MAKE_FILE} ${LOC_MKF} |
502 |
+- ${CC} ${LDFLAGS} sample_rand.o ${LD_STATIC} \ |
503 |
++ ${CC} ${CPPFLAGS} ${LDFLAGS} sample_rand.o ${LD_STATIC} \ |
504 |
+ ${CALC_STATIC_LIBS} ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ |
505 |
+ |
506 |
+ sample_many-static${EXT}: sample_many.o ${CALC_STATIC_LIBS} \ |
507 |
+ ${MAKE_FILE} ${LOC_MKF} |
508 |
+- ${CC} ${LDFLAGS} sample_many.o ${LD_STATIC} \ |
509 |
++ ${CC} ${CPPFLAGS} ${LDFLAGS} sample_many.o ${LD_STATIC} \ |
510 |
+ ${CALC_STATIC_LIBS} ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ |
511 |
+ |
512 |
+ ### |
513 |
+@@ -4190,7 +4190,7 @@ depend: hsrc custom/Makefile |
514 |
+ ${Q} :> skel/makedep.out |
515 |
+ ${Q} cd skel; ${MAKEDEPEND} \ |
516 |
+ -w 1 -f makedep.out -- \ |
517 |
+- ${CFLAGS} ${LDFLAGS} -- \ |
518 |
++ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -- \ |
519 |
+ ${C_SRC} ${BUILD_C_SRC} 2>/dev/null |
520 |
+ -${Q} for i in ${C_SRC} ${BUILD_C_SRC} /dev/null; do \ |
521 |
+ if [ X"$$i" != X"/dev/null" ]; then \ |
522 |
+--- a/custom/Makefile |
523 |
++++ b/custom/Makefile |
524 |
+@@ -1271,7 +1271,7 @@ custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \ |
525 |
+ ${CALC_STATIC_LIBCUSTCALC} |
526 |
+ |
527 |
+ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE} |
528 |
+- ${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@ |
529 |
++ ${CC} ${CPPFLAGS} ${LDFLAGS} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@ |
530 |
+ |
531 |
+ ## |
532 |
+ # |
533 |
+@@ -1280,7 +1280,7 @@ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE} |
534 |
+ ## |
535 |
+ |
536 |
+ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE} |
537 |
+- ${CC} ${CFLAGS} ${LDFLAGS} c_sysinfo.c -c |
538 |
++ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} c_sysinfo.c -c |
539 |
+ |
540 |
+ ## |
541 |
+ # |
542 |
+@@ -1407,7 +1407,7 @@ depend: |
543 |
+ ${Q} :> skel/custom/makedep.out |
544 |
+ ${Q} cd skel/custom; ${MAKEDEPEND} \ |
545 |
+ -I../../.. -w 1 -f makedep.out -- \ |
546 |
+- ${CFLAGS} ${LDFLAGS} -- \ |
547 |
++ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -- \ |
548 |
+ ${C_SRC} 2>/dev/null |
549 |
+ ${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out |
550 |
+ -${Q} for i in ${C_SRC} /dev/null; do \ |
551 |
+--- a/custom/Makefile.simple |
552 |
++++ b/custom/Makefile.simple |
553 |
+@@ -748,7 +748,7 @@ custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \ |
554 |
+ ${CALC_STATIC_LIBCUSTCALC} |
555 |
+ |
556 |
+ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE} |
557 |
+- ${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@ |
558 |
++ ${CC} ${LDFLAGS} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@ |
559 |
+ |
560 |
+ ## |
561 |
+ # |
562 |
+@@ -757,7 +757,7 @@ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE} |
563 |
+ ## |
564 |
+ |
565 |
+ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE} |
566 |
+- ${CC} ${CFLAGS} c_sysinfo.c -c |
567 |
++ ${CC} ${CFLAGS} ${LDFLAGS} c_sysinfo.c -c |
568 |
+ |
569 |
+ ## |
570 |
+ # |
571 |
+--- a/custom/Makefile.tail |
572 |
++++ b/custom/Makefile.tail |
573 |
+@@ -93,7 +93,7 @@ custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \ |
574 |
+ ${CALC_STATIC_LIBCUSTCALC} |
575 |
+ |
576 |
+ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE} |
577 |
+- ${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@ |
578 |
++ ${CC} ${CPPFLAGS} ${LDFLAGS} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@ |
579 |
+ |
580 |
+ ## |
581 |
+ # |
582 |
+@@ -102,7 +102,7 @@ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE} |
583 |
+ ## |
584 |
+ |
585 |
+ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE} |
586 |
+- ${CC} ${CFLAGS} c_sysinfo.c -c |
587 |
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} c_sysinfo.c -c |
588 |
+ |
589 |
+ ## |
590 |
+ # |