svn commit: r255944 - in head/sys/boot: i386/efi powerpc/boot1.chrp userboot/libstand userboot/test userboot/userboot

[Bryan Drewery]

Author: bdrewery (ports committer)
Date: Sun Sep 29 20:20:17 2013
New Revision: 255944
URL: http://svnweb.freebsd.org/changeset/base/255944

Log:
  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.
  
  This is similar to previous cleanup done in r188895
  
  Approved by:	bapt
  Reviewed by:	jlh (earlier version)
  Approved by:	re (marius)
  MFC after:	1 week

Modified:
  head/sys/boot/i386/efi/Makefile
  head/sys/boot/powerpc/boot1.chrp/Makefile
  head/sys/boot/userboot/libstand/Makefile
  head/sys/boot/userboot/test/Makefile
  head/sys/boot/userboot/userboot/Makefile

Modified: head/sys/boot/i386/efi/Makefile
==============================================================================
--- head/sys/boot/i386/efi/Makefile	Sun Sep 29 20:10:22 2013	(r255943)
+++ head/sys/boot/i386/efi/Makefile	Sun Sep 29 20:20:17 2013	(r255944)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 NO_MAN=
-WITHOUT_SSP=
 BUILDING_EFI=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		loader.sym
 INTERNALPROG=

Modified: head/sys/boot/powerpc/boot1.chrp/Makefile
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/Makefile	Sun Sep 29 20:10:22 2013	(r255943)
+++ head/sys/boot/powerpc/boot1.chrp/Makefile	Sun Sep 29 20:20:17 2013	(r255944)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
+SSP_CFLAGS=
 
 PROG=           boot1.elf
 NEWVERSWHAT=    "Open Firmware boot block" ${MACHINE_ARCH}

Modified: head/sys/boot/userboot/libstand/Makefile
==============================================================================
--- head/sys/boot/userboot/libstand/Makefile	Sun Sep 29 20:10:22 2013	(r255943)
+++ head/sys/boot/userboot/libstand/Makefile	Sun Sep 29 20:20:17 2013	(r255944)
@@ -6,10 +6,10 @@
 #   quite large.
 #
 
-WITHOUT_SSP=
 NO_MAN=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 S=		${.CURDIR}/../../../../lib/libstand
 

Modified: head/sys/boot/userboot/test/Makefile
==============================================================================
--- head/sys/boot/userboot/test/Makefile	Sun Sep 29 20:10:22 2013	(r255943)
+++ head/sys/boot/userboot/test/Makefile	Sun Sep 29 20:20:17 2013	(r255944)
@@ -2,9 +2,9 @@
 
 
 NO_MAN=
-WITHOUT_SSP=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		test
 INTERNALPROG=

Modified: head/sys/boot/userboot/userboot/Makefile
==============================================================================
--- head/sys/boot/userboot/userboot/Makefile	Sun Sep 29 20:10:22 2013	(r255943)
+++ head/sys/boot/userboot/userboot/Makefile	Sun Sep 29 20:20:17 2013	(r255944)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 NO_MAN=
-WITHOUT_SSP=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 SHLIB_NAME=	userboot.so
 NO_CTF=		yes