summaryrefslogtreecommitdiff
path: root/mk/bsd.prefs.mk
diff options
context:
space:
mode:
authorkhorben <khorben@pkgsrc.org>2017-04-16 23:12:37 +0000
committerkhorben <khorben@pkgsrc.org>2017-04-16 23:12:37 +0000
commit086f9cd2882ceac5e75fbbba72d7d804c538b17c (patch)
treec2f6c46d6b2d898ae1653891686ea36d750ff1ca /mk/bsd.prefs.mk
parent9302d3ea518c52b2b3072ba8407d46b7e78fcc2f (diff)
downloadpkgsrc-086f9cd2882ceac5e75fbbba72d7d804c538b17c.tar.gz
Add granularity to PKGSRC_USE_FORTIFY and PKGSRC_USE_RELRO
The new options are, for FORTIFY: "no" Do not pass any flags for FORTIFY "weak" Pass -D_FORTIFY_SOURCE=1 "strong" Pass -D_FORTIFY_SOURCE=2 This allows users to reduce the level of FORTIFY specified if necessary or desired. The previous setting as "yes" is now equivalent to "strong" (the default when enabling). The new options are, for RELRO: "no" Do not pass any flags for RELRO "partial" Pass -Wl,-z,relro "full" Pass -Wl,-z,relro -Wl,-z,now This allows users to reduce the level of RELRO specified if necessary or desired. The previous setting as "yes" is now equivalent to "full" (the default when enabling). This is intended to match the changes committed by jperkin@ (for SSP) after our discussion a (long) while back. No functional change intended (with the settings supported so far).
Diffstat (limited to 'mk/bsd.prefs.mk')
-rw-r--r--mk/bsd.prefs.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 38ec9152b1c..61195e890df 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.389 2017/02/01 09:55:07 sevan Exp $
+# $NetBSD: bsd.prefs.mk,v 1.390 2017/04/16 23:12:37 khorben Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -695,13 +695,13 @@ _PKGSRC_MKPIE= yes
.endif
_PKGSRC_USE_FORTIFY= no
-.if (${PKGSRC_USE_FORTIFY:tl} == "yes") && \
+.if (${PKGSRC_USE_FORTIFY:tl} != "no") && \
(${_OPSYS_SUPPORTS_FORTIFY:Uno} == "yes")
_PKGSRC_USE_FORTIFY= yes
.endif
_PKGSRC_USE_RELRO= no
-.if (${PKGSRC_USE_RELRO:tl} == "yes") && \
+.if (${PKGSRC_USE_RELRO:tl} != "no") && \
(${_OPSYS_SUPPORTS_RELRO:Uno} == "yes")
_PKGSRC_USE_RELRO= yes
.endif