mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-13 21:47:44 +00:00
Make two changes:
1) Fix linking with glibc-2.42 (add -lm for powf)
2) Fix broken -Wl,--export-dynamic patch
More specifically on the latter...
The fix in
commit 7d8ac434fcb3a1e0fe8ee881c3f90cea0b91e1a9
Author: Tony Vroon <chainsaw@gentoo.org>
AuthorDate: Sat Sep 24 11:48:10 2011 +0000
Commit: Tony Vroon <chainsaw@gentoo.org>
CommitDate: Sat Sep 24 11:48:10 2011 +0000
Debian patch scavenged by Pacho Ramos enables building on GCC 4.6; closes bug #362261 by Diego Elio Pettenò.
(Portage version: 2.1.10.18/cvs/Linux x86_64)
is OK:
- -Wl, --export-dynamic
+ -rdynamic
...
It later got replaced by a sed in
commit 848e2fef33a7334e6ea074de9826d6e2ef281882
Author: Samuli Suominen <ssuominen@gentoo.org>
AuthorDate: Sat Nov 12 15:19:14 2011 +0000
Commit: Samuli Suominen <ssuominen@gentoo.org>
CommitDate: Sat Nov 12 15:19:14 2011 +0000
Version bump wrt #381733 by Jesse Adelman
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)
which was also OK.
...
It then got replaced by a patch (not clear from where, might be upstream, dunno) in
commit 5a2369ba50
Author: Harri Nieminen <moikkis@gmail.com>
AuthorDate: Mon Feb 27 11:21:58 2017 +0200
Commit: David Seifert <soap@gentoo.org>
CommitDate: Wed Mar 1 21:43:16 2017 +0100
x11-misc/cairo-clock: EAPI bump 4 -> 6, fix #452106
Gentoo-Bug: https://bugs.gentoo.org/452106
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4091
which does:
-cairo_clock_LDFLAGS = -Wl, --export-dynamic
+cairo_clock_LDFLAGS = -Wl,-export-dynamic
which is NOT ok, because it tells ld that you want an entry point of 'xport-dynamic'.
Bug: https://bugs.gentoo.org/362261
Bug: https://bugs.gentoo.org/452106
Closes: https://bugs.gentoo.org/961078
Signed-off-by: Sam James <sam@gentoo.org>
12 lines
273 B
Diff
12 lines
273 B
Diff
https://bugs.gentoo.org/362261
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -1,7 +1,7 @@
|
|
bin_PROGRAMS = cairo_clock
|
|
transform = s/_/-/g
|
|
|
|
-cairo_clock_LDFLAGS = -Wl, --export-dynamic
|
|
+cairo_clock_LDFLAGS = -Wl,--export-dynamic
|
|
|
|
cairo_clock_LDADD = \
|
|
$(GLIB_LIBS) \
|