diff options
author | khorben <khorben@pkgsrc.org> | 2017-10-24 00:00:35 +0000 |
---|---|---|
committer | khorben <khorben@pkgsrc.org> | 2017-10-24 00:00:35 +0000 |
commit | 3a71b0083f54f39ee0bddc2c6ef897cbaa310ba4 (patch) | |
tree | 8edb8cd9ea8e481a0dc0de66a202d64a80ff310b /net | |
parent | 8839740e56990ba321c574df7543413917a7d3ff (diff) | |
download | pkgsrc-3a71b0083f54f39ee0bddc2c6ef897cbaa310ba4.tar.gz |
Add support for CFLAGS and LDFLAGS
This notably fixes building with RELRO enabled.
Bump PKGREVISION, since this generates a different binary now that SSP and
FORTIFY are enabled.
Diffstat (limited to 'net')
-rw-r--r-- | net/nstx/Makefile | 6 | ||||
-rw-r--r-- | net/nstx/distinfo | 4 | ||||
-rw-r--r-- | net/nstx/patches/patch-aa | 19 |
3 files changed, 24 insertions, 5 deletions
diff --git a/net/nstx/Makefile b/net/nstx/Makefile index b8966e9f6ab..7377d43ffb7 100644 --- a/net/nstx/Makefile +++ b/net/nstx/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2017/09/03 08:36:58 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2017/10/24 00:00:35 khorben Exp $ # DISTNAME= nstx-1.1-beta6 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/-beta/beta/} CATEGORIES= net #MASTER_SITES= http://nstx.dereference.de/nstx/ @@ -11,6 +12,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://nstx.dereference.de/nstx/ COMMENT= Nameserver Transfer Protocol +MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} +MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} + INSTALLATION_DIRS+= bin share/doc/nstx do-install: diff --git a/net/nstx/distinfo b/net/nstx/distinfo index a97b2566558..5ecaf0f5f75 100644 --- a/net/nstx/distinfo +++ b/net/nstx/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 00:35:16 agc Exp $ +$NetBSD: distinfo,v 1.4 2017/10/24 00:00:35 khorben Exp $ SHA1 (nstx-1.1-beta6.tgz) = 82d339f499c6e625708371f5f729b7f7bf38a6a0 RMD160 (nstx-1.1-beta6.tgz) = 1392d7f96c9668cc40b65fa30cbaf8cf1b64feb2 SHA512 (nstx-1.1-beta6.tgz) = 93aa795446d1fe38239559c5a82e595ed59b37ab8ab674b1cb80c6a079ecb9e14bef87b670febe77920560239001206da4ce4875092ff5334770eb1f3447d45f Size (nstx-1.1-beta6.tgz) = 20458 bytes -SHA1 (patch-aa) = 89d95177ab802da016d42de15bf118941e9843b0 +SHA1 (patch-aa) = 290be0cd9cd71d246656da154cfc9a1fe4a67a1e SHA1 (patch-ab) = fafa3e2431c412727b784cceb715cbc9eedb677c diff --git a/net/nstx/patches/patch-aa b/net/nstx/patches/patch-aa index 6829429848d..24cb799a7af 100644 --- a/net/nstx/patches/patch-aa +++ b/net/nstx/patches/patch-aa @@ -1,6 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/11/16 02:04:39 minskim Exp $ +$NetBSD: patch-aa,v 1.2 2017/10/24 00:00:36 khorben Exp $ ---- Makefile.orig 2004-06-27 14:46:38.000000000 -0700 +Add support for CFLAGS and LDFLAGS + +--- Makefile.orig 2004-06-27 21:46:38.000000000 +0000 +++ Makefile @@ -1,5 +1,3 @@ -CFLAGS += -ggdb -Wall -Werror @@ -8,3 +10,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/11/16 02:04:39 minskim Exp $ NSTXD_SRCS = nstxd.c nstx_encode.c nstx_pstack.c nstx_dns.c nstx_tuntap.c nstx_queue.c NSTXD_OBJS = ${NSTXD_SRCS:.c=.o} +@@ -11,10 +9,10 @@ PROGS = nstxd nstxcd + all: $(PROGS) + + nstxd: $(NSTXD_OBJS) +- $(CC) $(CFLAGS) -o nstxd $(NSTXD_OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o nstxd $(NSTXD_OBJS) + + nstxcd: $(NSTXCD_OBJS) +- $(CC) $(CFLAGS) -o nstxcd $(NSTXCD_OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o nstxcd $(NSTXCD_OBJS) + + clean: + rm -f *.o $(PROGS) Makefile.bak *~ core |