svn commit: r256266 - in stable/9/sys/boot: i386/efi powerpc/boot1.chrp userboot/libstand userboot/test userboot/userboot

[Bryan Drewery]

Author: bdrewery (ports committer)
Date: Thu Oct 10 12:46:26 2013
New Revision: 256266
URL: http://svnweb.freebsd.org/changeset/base/256266

Log:
  MFC r255944:
  
    Use MK_SSP=no after including bsd.own.mk to disable SSP instead of user-knob
    WITH[OUT]_SSP to avoid hitting an error if user has WITH_SSP in their
    make.conf. Ports now use this knob.
  
      make[7]: "/usr/src/share/mk/bsd.own.mk" line 466: WITH_SSP and
      WITHOUT_SSP can't both be set.
  
  Approved by:	bapt

Modified:
  stable/9/sys/boot/i386/efi/Makefile
  stable/9/sys/boot/powerpc/boot1.chrp/Makefile
  stable/9/sys/boot/userboot/libstand/Makefile
  stable/9/sys/boot/userboot/test/Makefile
  stable/9/sys/boot/userboot/userboot/Makefile
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)

Modified: stable/9/sys/boot/i386/efi/Makefile
==============================================================================
--- stable/9/sys/boot/i386/efi/Makefile	Thu Oct 10 12:44:00 2013	(r256265)
+++ stable/9/sys/boot/i386/efi/Makefile	Thu Oct 10 12:46:26 2013	(r256266)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 NO_MAN=
-WITHOUT_SSP=
 BUILDING_EFI=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		loader.sym
 INTERNALPROG=

Modified: stable/9/sys/boot/powerpc/boot1.chrp/Makefile
==============================================================================
--- stable/9/sys/boot/powerpc/boot1.chrp/Makefile	Thu Oct 10 12:44:00 2013	(r256265)
+++ stable/9/sys/boot/powerpc/boot1.chrp/Makefile	Thu Oct 10 12:46:26 2013	(r256266)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
+SSP_CFLAGS=
 
 PROG=           boot1.elf
 NEWVERSWHAT=    "Open Firmware boot block" ${MACHINE_ARCH}

Modified: stable/9/sys/boot/userboot/libstand/Makefile
==============================================================================
--- stable/9/sys/boot/userboot/libstand/Makefile	Thu Oct 10 12:44:00 2013	(r256265)
+++ stable/9/sys/boot/userboot/libstand/Makefile	Thu Oct 10 12:46:26 2013	(r256266)
@@ -6,10 +6,10 @@
 #   quite large.
 #
 
-WITHOUT_SSP=
 NO_MAN=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 S=		${.CURDIR}/../../../../lib/libstand
 

Modified: stable/9/sys/boot/userboot/test/Makefile
==============================================================================
--- stable/9/sys/boot/userboot/test/Makefile	Thu Oct 10 12:44:00 2013	(r256265)
+++ stable/9/sys/boot/userboot/test/Makefile	Thu Oct 10 12:46:26 2013	(r256266)
@@ -2,9 +2,9 @@
 
 
 NO_MAN=
-WITHOUT_SSP=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		test
 INTERNALPROG=

Modified: stable/9/sys/boot/userboot/userboot/Makefile
==============================================================================
--- stable/9/sys/boot/userboot/userboot/Makefile	Thu Oct 10 12:44:00 2013	(r256265)
+++ stable/9/sys/boot/userboot/userboot/Makefile	Thu Oct 10 12:46:26 2013	(r256266)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 NO_MAN=
-WITHOUT_SSP=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 SHLIB_NAME=	userboot.so
 NO_CTF=		yes