summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Feldman <NP-Hardass@gentoo.org>2020-09-03 11:22:26 -0400
committerAdam Feldman <NP-Hardass@gentoo.org>2020-09-03 11:23:11 -0400
commit09d29bd3284b92b6796f901c59c1ed8a80dead70 (patch)
treef10a0a333d8f07a94af1f3497196b783e59d248e
parentdev-php/igbinary: bump to v3.1.5 (diff)
downloadgentoo-09d29bd3284b92b6796f901c59c1ed8a80dead70.tar.gz
gentoo-09d29bd3284b92b6796f901c59c1ed8a80dead70.tar.bz2
gentoo-09d29bd3284b92b6796f901c59c1ed8a80dead70.zip
x11-misc/primus: Use LDFLAGS
Closes: https://bugs.gentoo.org/740198 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>
-rw-r--r--x11-misc/primus/files/primus-0.2-respect-ldflags.patch19
-rw-r--r--x11-misc/primus/primus-0.2-r2.ebuild (renamed from x11-misc/primus/primus-0.2-r1.ebuild)5
2 files changed, 23 insertions, 1 deletions
diff --git a/x11-misc/primus/files/primus-0.2-respect-ldflags.patch b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch
new file mode 100644
index 000000000000..5d9804517437
--- /dev/null
+++ b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch
@@ -0,0 +1,19 @@
+From b4663367d16190cf57b632cd59425b1b8b43f2f3 Mon Sep 17 00:00:00 2001
+From: Vincent Cheng <vcheng@debian.org>
+Date: Sat, 25 Jul 2015 21:10:10 -0700
+Subject: [PATCH] build with LDFLAGS defined by environment
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index ab37e6e..a83e465 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,4 +30,4 @@ CXXFLAGS += -DPRIMUS_libGLd='"$(PRIMUS_libGLd)"'
+
+ $(LIBDIR)/libGL.so.1: libglfork.cpp
+ mkdir -p $(LIBDIR)
+- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< -lX11 -lpthread -lrt
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< $(LDFLAGS) -lX11 -lpthread -lrt
diff --git a/x11-misc/primus/primus-0.2-r1.ebuild b/x11-misc/primus/primus-0.2-r2.ebuild
index b17cd30fb649..a25dcfebb0f8 100644
--- a/x11-misc/primus/primus-0.2-r1.ebuild
+++ b/x11-misc/primus/primus-0.2-r2.ebuild
@@ -21,7 +21,10 @@ RDEPEND="
"
DEPEND="virtual/opengl"
-PATCHES=( "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" )
+PATCHES=(
+ "${FILESDIR}/primus-0.2-libglvnd-workaround.patch"
+ "${FILESDIR}/primus-0.2-respect-ldflags.patch"
+)
src_prepare() {
default