1 |
commit: 09d29bd3284b92b6796f901c59c1ed8a80dead70 |
2 |
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 3 15:22:26 2020 +0000 |
4 |
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 3 15:23:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d29bd3 |
7 |
|
8 |
x11-misc/primus: Use LDFLAGS |
9 |
|
10 |
Closes: https://bugs.gentoo.org/740198 |
11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
12 |
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> |
13 |
|
14 |
.../primus/files/primus-0.2-respect-ldflags.patch | 19 +++++++++++++++++++ |
15 |
.../{primus-0.2-r1.ebuild => primus-0.2-r2.ebuild} | 5 ++++- |
16 |
2 files changed, 23 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/x11-misc/primus/files/primus-0.2-respect-ldflags.patch b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..5d980451743 |
21 |
--- /dev/null |
22 |
+++ b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch |
23 |
@@ -0,0 +1,19 @@ |
24 |
+From b4663367d16190cf57b632cd59425b1b8b43f2f3 Mon Sep 17 00:00:00 2001 |
25 |
+From: Vincent Cheng <vcheng@××××××.org> |
26 |
+Date: Sat, 25 Jul 2015 21:10:10 -0700 |
27 |
+Subject: [PATCH] build with LDFLAGS defined by environment |
28 |
+ |
29 |
+--- |
30 |
+ Makefile | 2 +- |
31 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
32 |
+ |
33 |
+diff --git a/Makefile b/Makefile |
34 |
+index ab37e6e..a83e465 100644 |
35 |
+--- a/Makefile |
36 |
++++ b/Makefile |
37 |
+@@ -30,4 +30,4 @@ CXXFLAGS += -DPRIMUS_libGLd='"$(PRIMUS_libGLd)"' |
38 |
+ |
39 |
+ $(LIBDIR)/libGL.so.1: libglfork.cpp |
40 |
+ mkdir -p $(LIBDIR) |
41 |
+- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< -lX11 -lpthread -lrt |
42 |
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< $(LDFLAGS) -lX11 -lpthread -lrt |
43 |
|
44 |
diff --git a/x11-misc/primus/primus-0.2-r1.ebuild b/x11-misc/primus/primus-0.2-r2.ebuild |
45 |
similarity index 93% |
46 |
rename from x11-misc/primus/primus-0.2-r1.ebuild |
47 |
rename to x11-misc/primus/primus-0.2-r2.ebuild |
48 |
index b17cd30fb64..a25dcfebb0f 100644 |
49 |
--- a/x11-misc/primus/primus-0.2-r1.ebuild |
50 |
+++ b/x11-misc/primus/primus-0.2-r2.ebuild |
51 |
@@ -21,7 +21,10 @@ RDEPEND=" |
52 |
" |
53 |
DEPEND="virtual/opengl" |
54 |
|
55 |
-PATCHES=( "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" ) |
56 |
+PATCHES=( |
57 |
+ "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" |
58 |
+ "${FILESDIR}/primus-0.2-respect-ldflags.patch" |
59 |
+) |
60 |
|
61 |
src_prepare() { |
62 |
default |