diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-09-20 12:54:54 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-09-20 12:54:54 +0000 |
| commit | c93dfc2e9f8b7b990c22c6baa6cdab361cd12e16 (patch) | |
| tree | e61ab76efa292f985d8e20e449572329fa964c1c /Mk | |
| parent | b10d5a64b7ea8bb32e9735304272e7344926e3b2 (diff) | |
| download | ports-c93dfc2e9f8b7b990c22c6baa6cdab361cd12e16.tar.gz ports-c93dfc2e9f8b7b990c22c6baa6cdab361cd12e16.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 11 | ||||
| -rw-r--r-- | Mk/bsd.ssp.mk | 30 |
2 files changed, 41 insertions, 0 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index a86c85c3c8ca..3fe95b34cbfb 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -301,6 +301,13 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # passed to the compiler by setting DEBUG_FLAGS. It is # set to "-g" at default. # +# WITH_SSP - If set, SSP_FLAGS (defaults to -fstack-protector) +# is added to CFLAGS and the necessary flags +# are added to LDFLAGS. Note that SSP_UNSAFE +# can be used in Makefiles by port maintainers +# if a port breaks with it (it should be +# extremely rare). +# # USE_BZIP2 - If set, this port tarballs use bzip2, not gzip, for # compression. # USE_LHA - If set, this port distfile uses lha for compression @@ -1563,6 +1570,10 @@ DEBUG_FLAGS?= -g CFLAGS:= ${CFLAGS:N-O*:N-fno-strict*} ${DEBUG_FLAGS} .endif +.if defined(WITH_SSP) +.include "${PORTSDIR}/Mk/bsd.ssp.mk" +.endif + .if defined(NOPORTDOCS) PLIST_SUB+= PORTDOCS="@comment " .else diff --git a/Mk/bsd.ssp.mk b/Mk/bsd.ssp.mk new file mode 100644 index 000000000000..c71b3b3722c4 --- /dev/null +++ b/Mk/bsd.ssp.mk @@ -0,0 +1,30 @@ +# $FreeBSD$ +# SSP Support + +SSP_Include_MAINTAINER= portmgr@FreeBSD.org + +# See: http://svnweb.freebsd.org/base/head/lib/libc/libc.ldscript?revision=251668&view=markup +.if ${OSVERSION} < 1000036 && ${ARCH} == i386 + +# Disabled on i386 for now on releases without the ldscript as too many ports +# do not respect LDFLAGS and fail to build due to not adding in -lssp_nonshared when needed +# despite dependencies working fine, which breaks a lot. Can enable once LDFLAGS is more +# supported. XXX +SSP_UNSAFE= yes + +# i386 needs -lssp_nonshared, see svn link above for more information +SSP_NEED_NONSHARED= yes +.endif + +.if defined(WITH_SSP) && !defined(WITHOUT_SSP) && !defined(SSP_UNSAFE) && \ + (${ARCH} == i386 || ${ARCH} == amd64) +# Overridable as a user may want to use -fstack-protector-all +SSP_CFLAGS?= -fstack-protector +CFLAGS:= ${CFLAGS} ${SSP_CFLAGS} +LDFLAGS:= ${LDFLAGS} -fstack-protector +# -lssp_nonshared is needed on i386 where /usr/lib/libc.so is not an ldscript +# This is currently unused XXX +. if defined(SSP_NEED_NONSHARED) +LDFLAGS:= ${LDFLAGS} -lssp_nonshared +. endif +.endif |