summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-07-13 12:16:27 +0000
committerwiz <wiz@pkgsrc.org>2017-07-13 12:16:27 +0000
commit6b762a3157d4f30c342148ee4cec8da0e8c47f4e (patch)
treebd825d75e451c9673564ecb3b84b879cc91ab855
parentc831236860224dba81981c6f8aa35c25d90865b0 (diff)
downloadpkgsrc-6b762a3157d4f30c342148ee4cec8da0e8c47f4e.tar.gz
Honor LDFLAGS (and CXXFLAGS while I'm here). Fixes RELRO build.
-rw-r--r--audio/sfxr/Makefile3
-rw-r--r--audio/sfxr/distinfo3
-rw-r--r--audio/sfxr/patches/patch-Makefile16
3 files changed, 19 insertions, 3 deletions
diff --git a/audio/sfxr/Makefile b/audio/sfxr/Makefile
index 407bf600e56..39186a5dd3c 100644
--- a/audio/sfxr/Makefile
+++ b/audio/sfxr/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/02/12 06:25:05 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.27 2017/07/13 12:16:27 wiz Exp $
DISTNAME= sfxr-sdl-1.2.1
PKGNAME= ${DISTNAME:S/-sdl//}
diff --git a/audio/sfxr/distinfo b/audio/sfxr/distinfo
index ea0dc94c459..c306800e9b6 100644
--- a/audio/sfxr/distinfo
+++ b/audio/sfxr/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 01:12:49 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/07/13 12:16:27 wiz Exp $
SHA1 (sfxr-sdl-1.2.1.tar.gz) = c5b1a755f45aae256101b1f83dcd6f71efb4f206
RMD160 (sfxr-sdl-1.2.1.tar.gz) = be13e8591b109dcc348bc407f3d5dcfae540cf13
SHA512 (sfxr-sdl-1.2.1.tar.gz) = a918f5212d77e10769d44808e0fa34c3df1da6880663c6a7d966860d145c0c2979b6a6772d12a35ca44b4d7337a38698c722569446eca95c2041ae86ec691adc
Size (sfxr-sdl-1.2.1.tar.gz) = 19444 bytes
+SHA1 (patch-Makefile) = 95463748fccf863936c8bfc4f45a411d8b4b98b3
diff --git a/audio/sfxr/patches/patch-Makefile b/audio/sfxr/patches/patch-Makefile
new file mode 100644
index 00000000000..08edb19e0ca
--- /dev/null
+++ b/audio/sfxr/patches/patch-Makefile
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2017/07/13 12:16:27 wiz Exp $
+
+Honor CXXFLAGS and LDFLAGS.
+
+--- Makefile.orig 2017-07-13 12:05:54.572398200 +0000
++++ Makefile
+@@ -1,7 +1,7 @@
+ CFLAGS=-ggdb
+ GTK=3.0
+-CXXFLAGS=$(CFLAGS) `sdl-config --cflags` `pkg-config gtk+-${GTK} --cflags`
+-LDFLAGS=`sdl-config --libs` `pkg-config gtk+-${GTK} --libs`
++CXXFLAGS+=$(CFLAGS) `sdl-config --cflags` `pkg-config gtk+-${GTK} --cflags`
++LDFLAGS+=`sdl-config --libs` `pkg-config gtk+-${GTK} --libs`
+
+ sfxr: main.cpp tools.h sdlkit.h
+ $(CXX) $< $(CXXFLAGS) $(LDFLAGS) -o $@