diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-11-02 20:01:31 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-11-02 20:01:31 +0000 |
| commit | ec713d99b6af25c30e842e39916f298ef1a0e668 (patch) | |
| tree | fff6797e92d48b34bf98661d511e5bfa6e44715b /Mk/bsd.port.mk | |
| parent | 218fffb5b01c1e07c302f9f3a6e4801a0731a9cf (diff) | |
| download | ports-ec713d99b6af25c30e842e39916f298ef1a0e668.tar.gz ports-ec713d99b6af25c30e842e39916f298ef1a0e668.zip | |
- Enable SSP by default.
This is the culmination of years of work and testing including work by jlh@.
This will enable SSP by default for all amd64 releases, and i386 releases
10.0 and over.
With hat: portmgr
Tested by: multiple exp-runs, CFT package repository, CFT ports
Discussed with: bapt, antoine
Notes
Notes:
svn path=/head/; revision=372086
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index bcd1ef6ac109..84d38c2fb0a1 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -317,8 +317,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # # WITH_DEBUG_PORTS - A list of origins for which WITH_DEBUG will be set # -# WITH_SSP_PORTS -# - If set, SSP_FLAGS (defaults to -fstack-protector) +# WITHOUT_SSP - Disable SSP. +# +# SSP_CFLAGS - Defaults to -fstack-protector. This value # is added to CFLAGS and the necessary flags # are added to LDFLAGS. Note that SSP_UNSAFE # can be used in Makefiles by port maintainers @@ -1636,7 +1637,7 @@ INSTALL_TARGET:= ${INSTALL_TARGET:S/^install-strip$/install/g} .endif .endif -.if defined(WITH_SSP) || defined(WITH_SSP_PORTS) +.if !defined(WITHOUT_SSP) .include "${PORTSDIR}/Mk/bsd.ssp.mk" .endif |