svn commit: r256268 - stable/8/sys/boot/powerpc/boot1.chrp

[Bryan Drewery]

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

Log:
  MFC r255944 (partial):
  
    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/8/sys/boot/powerpc/boot1.chrp/Makefile
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/boot/   (props changed)

Modified: stable/8/sys/boot/powerpc/boot1.chrp/Makefile
==============================================================================
--- stable/8/sys/boot/powerpc/boot1.chrp/Makefile	Thu Oct 10 12:47:33 2013	(r256267)
+++ stable/8/sys/boot/powerpc/boot1.chrp/Makefile	Thu Oct 10 12:47:34 2013	(r256268)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
+SSP_CFLAGS=
 
 PROG=           boot1.elf
 NEWVERSWHAT=    "Open Firmware boot block" ${MACHINE_ARCH}