From owner-svn-src-all@FreeBSD.ORG Thu Oct 10 12:46:28 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EB62063F; Thu, 10 Oct 2013 12:46:27 +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 C9EE42912; Thu, 10 Oct 2013 12:46:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ACkRQD012785; Thu, 10 Oct 2013 12:46:27 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ACkQOY012780; Thu, 10 Oct 2013 12:46:26 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201310101246.r9ACkQOY012780@svn.freebsd.org> From: Bryan Drewery Date: Thu, 10 Oct 2013 12:46:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r256266 - in stable/9/sys/boot: i386/efi powerpc/boot1.chrp userboot/libstand userboot/test userboot/userboot X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 12:46:28 -0000 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 +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 +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 +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 +MK_SSP= no SHLIB_NAME= userboot.so NO_CTF= yes