summaryrefslogtreecommitdiff
path: root/mk/defaults
diff options
context:
space:
mode:
authorkhorben <khorben@pkgsrc.org>2015-08-10 21:44:34 +0000
committerkhorben <khorben@pkgsrc.org>2015-08-10 21:44:34 +0000
commit75f8b55318db0d55f9fd097491a2422c71005d6c (patch)
treecf909b6e22237c8b9fd5f56fd6422f8594efcf33 /mk/defaults
parentc887fd246d119ae569e381ce71a69e80d26cd947 (diff)
downloadpkgsrc-75f8b55318db0d55f9fd097491a2422c71005d6c.tar.gz
Add support for building with fortify
This is pretty much the same change as with SSP, and completes it with support for fortify (like USE_FORT in NetBSD's base system). Like SSP, this is disabled by default for the moment. Like in NetBSD's base system, enabling fortify explicitly also enables SSP by default - but SSP can still be disabled explicitly in this situation. All four combinations tested on NetBSD/amd64.
Diffstat (limited to 'mk/defaults')
-rw-r--r--mk/defaults/mk.conf14
1 files changed, 12 insertions, 2 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index e87e114a4a4..c2529bbd68e 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.258 2015/07/26 22:13:17 khorben Exp $
+# $NetBSD: mk.conf,v 1.259 2015/08/10 21:44:34 khorben Exp $
#
# This file provides default values for variables that may be overridden
@@ -215,10 +215,20 @@ PKGSRC_RUN_TEST?= no
# Possible: yes, no
# Default: no
+PKGSRC_USE_FORT?= no
+# Turns on substitute wrappers for commonly used functions that do not bounds
+# checking regularly, but could in some cases (with GCC for instance).
+# Possible: yes, no
+# Default: no
+
+.if ${PKGSRC_USE_FORT:Uno} != "no"
+PKGSRC_USE_SSP?= yes
+.else
PKGSRC_USE_SSP?= no
+.endif
# Set this to YES to enable stack-smashing protection (on supported platforms).
# Possible: yes, no
-# Default: no
+# Default: no, except if PKGSRC_USE_FORT is set to "yes".
.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
exists(/usr/X11R7/lib/libX11.so))