Date: Sun, 22 Sep 2013 00:26:05 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327844 - in head: . Mk Message-ID: <201309220026.r8M0Q5Lr078294@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Sep 22 00:26:05 2013 New Revision: 327844 URL: http://svnweb.freebsd.org/changeset/ports/327844 Log: - Rename public name of SSP support to WITH_SSP_PORTS as /usr/src has issues with 'installworld' when WITH_SSP is defined. [1] Keep WITH_SSP support for now since it has been announced as that already. - Remove redundant wording in UPDATING [2] Suggested by: bapt [1] Reported by: blakkheim on EFNet With hat: portmgr Modified: head/CHANGES head/Mk/bsd.port.mk head/Mk/bsd.ssp.mk head/UPDATING Modified: head/CHANGES ============================================================================== --- head/CHANGES Sat Sep 21 22:23:54 2013 (r327843) +++ head/CHANGES Sun Sep 22 00:26:05 2013 (r327844) @@ -13,7 +13,7 @@ All ports committers are allowed to comm 20130920: AUTHOR: bdrewery@FreeBSD.org - SSP support has been added to ports with WITH_SSP for i386 and amd64 + SSP support has been added to ports with WITH_SSP_PORTS for i386 and amd64 on FreeBSD 10, and amd64 on earlier versions. SSP_UNSAFE is added to disable in a port if it fails to build, but @@ -24,7 +24,7 @@ AUTHOR: bdrewery@FreeBSD.org On FreeBSD 10, this uses an ldscript in /usr/lib/libc.so to pull in libssp_nonshared.a to address issues linking on i386 [1]. - On earlier FreeBSD versions the WITH_SSP knob will add -lssp_nonshared + On earlier FreeBSD versions the WITH_SSP_PORTS knob will add -lssp_nonshared to LDFLAGS on i386. This is not needed on amd64. However, several hundred ports do not currently respect LDFLAGS, so this support is disabled currently as it causes build failures if a dependency is looking for the stack_chk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sat Sep 21 22:23:54 2013 (r327843) +++ head/Mk/bsd.port.mk Sun Sep 22 00:26:05 2013 (r327844) @@ -301,7 +301,8 @@ 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) +# WITH_SSP_PORTS +# - 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 @@ -1570,7 +1571,7 @@ DEBUG_FLAGS?= -g CFLAGS:= ${CFLAGS:N-O*:N-fno-strict*} ${DEBUG_FLAGS} .endif -.if defined(WITH_SSP) +.if defined(WITH_SSP) || defined(WITH_SSP_PORTS) .include "${PORTSDIR}/Mk/bsd.ssp.mk" .endif Modified: head/Mk/bsd.ssp.mk ============================================================================== --- head/Mk/bsd.ssp.mk Sat Sep 21 22:23:54 2013 (r327843) +++ head/Mk/bsd.ssp.mk Sun Sep 22 00:26:05 2013 (r327844) @@ -16,7 +16,7 @@ SSP_UNSAFE= yes SSP_NEED_NONSHARED= yes .endif -.if defined(WITH_SSP) && !defined(WITHOUT_SSP) && !defined(SSP_UNSAFE) && \ +.if !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 Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Sep 21 22:23:54 2013 (r327843) +++ head/UPDATING Sun Sep 22 00:26:05 2013 (r327844) @@ -25,20 +25,18 @@ you update your ports collection, before AFFECTS: Users of ports AUTHOR: bdrewery@FreeBSD.org - Optional Stack Protector [1] support has been added with the WITH_SSP + Optional Stack Protector [1] support has been added with the WITH_SSP_PORTS knob. - .if !empty(.CURDIR:M/usr/ports*) - WITH_SSP= yes - .endif + WITH_SSP_PORTS= yes This currently is only supported on FreeBSD 10 amd64/i386 and earlier - releases on amd64 only. + releases on amd64. The default SSP_CLFAGS is -fstack-protector, but -fstack-protector-all may optionally be set instead. - To enable support, add WITH_SSP=yes to your make.conf and rebuild all + To enable support, add WITH_SSP_PORTS=yes to your make.conf and rebuild all ports. # portmaster -af
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309220026.r8M0Q5Lr078294>