From owner-svn-src-stable@FreeBSD.ORG  Thu Oct 10 12:47:34 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id EA42F936;
 Thu, 10 Oct 2013 12:47:34 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D71172923;
 Thu, 10 Oct 2013 12:47:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AClYBT013349;
 Thu, 10 Oct 2013 12:47:34 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AClYXP013348;
 Thu, 10 Oct 2013 12:47:34 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201310101247.r9AClYXP013348@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 10 Oct 2013 12:47:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r256268 - stable/8/sys/boot/powerpc/boot1.chrp
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Oct 2013 12:47:35 -0000

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}