diff options
author | wiz <wiz@pkgsrc.org> | 2017-07-13 12:25:01 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-07-13 12:25:01 +0000 |
commit | 6850d2cfd77f145eafc08a4b68b436cb838bc338 (patch) | |
tree | 46ba63790dd5adedc4c00f8c65025c652684c643 | |
parent | bd6db1d2f2b7459e57394960c4150e912a593224 (diff) | |
download | pkgsrc-6850d2cfd77f145eafc08a4b68b436cb838bc338.tar.gz |
Honor LDFLAGS. Fixes RELRO build.
-rw-r--r-- | games/einstein-puzzle/distinfo | 4 | ||||
-rw-r--r-- | games/einstein-puzzle/patches/patch-Makefile | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/games/einstein-puzzle/distinfo b/games/einstein-puzzle/distinfo index 3f9b8ab16d7..02749034e63 100644 --- a/games/einstein-puzzle/distinfo +++ b/games/einstein-puzzle/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2016/09/29 12:09:48 joerg Exp $ +$NetBSD: distinfo,v 1.3 2017/07/13 12:25:01 wiz Exp $ SHA1 (einstein-puzzle-2.1.1.tar.gz) = d64acf11a56ed278eced25572c245ec1d9ac3822 RMD160 (einstein-puzzle-2.1.1.tar.gz) = c2a97550cf2c7aa45b113cec2cd7d968f6ae0bc2 SHA512 (einstein-puzzle-2.1.1.tar.gz) = e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3 Size (einstein-puzzle-2.1.1.tar.gz) = 1317979 bytes -SHA1 (patch-Makefile) = 7d185d20983e07e2aa6f0ad8f82aa4cf31934aa1 +SHA1 (patch-Makefile) = b6678409a268f4141d1d6146127cbc922050d5c6 diff --git a/games/einstein-puzzle/patches/patch-Makefile b/games/einstein-puzzle/patches/patch-Makefile index 14a75441053..3a6398830b6 100644 --- a/games/einstein-puzzle/patches/patch-Makefile +++ b/games/einstein-puzzle/patches/patch-Makefile @@ -1,8 +1,9 @@ -$NetBSD: patch-Makefile,v 1.2 2016/09/29 12:09:48 joerg Exp $ +$NetBSD: patch-Makefile,v 1.3 2017/07/13 12:25:01 wiz Exp $ - Add DESTDIR support. - Support install(1) that does not create directories automatically. - Fix linking against freetype. +- Honor LDFLAGS. --- Makefile.orig 2015-12-03 16:45:59.000000000 +0000 +++ Makefile @@ -21,7 +22,7 @@ $NetBSD: patch-Makefile,v 1.2 2016/09/29 12:09:48 joerg Exp $ -CXXFLAGS=-pipe -Wall $(OPTIMIZE) $(DEBUG) `sdl-config --cflags` -DPREFIX=L\"$(PREFIX)\" $(PROFILER) -LNFLAGS=-pipe -lSDL_ttf -lfreetype `sdl-config --libs` -lz -lSDL_mixer $(PROFILER) +CXXFLAGS+=-pipe -Wall $(OPTIMIZE) $(DEBUG) `sdl-config --cflags` -DPREFIX=L\"$(PREFIX)\" $(PROFILER) -+LNFLAGS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lSDL_ttf -lfreetype `sdl-config --libs` -lz -lSDL_mixer $(PROFILER) ++LNFLAGS= $(LDFLAGS) ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lSDL_ttf -lfreetype `sdl-config --libs` -lz -lSDL_mixer $(PROFILER) INSTALL=install TARGET=einstein |