Date: Sat, 21 Feb 2009 15:04:31 +0000 (UTC) From: Ruslan Ermilov <ru@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r188895 - in head: . gnu/lib/csu gnu/lib/libssp lib/csu lib/libstand lib/libthr libexec/rtld-elf rescue/librescue rescue/rescue sys/boot sys/boot/i386/loader sys/boot/ia64/common sys/bo... Message-ID: <200902211504.n1LF4VIh068864@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ru Date: Sat Feb 21 15:04:31 2009 New Revision: 188895 URL: http://svn.freebsd.org/changeset/base/188895 Log: Fix build when WITH_SSP is set explicitly. Submitted by: Jeremie Le Hen Modified: head/Makefile.inc1 head/gnu/lib/csu/Makefile head/gnu/lib/libssp/Makefile head/lib/csu/Makefile.inc head/lib/libstand/Makefile head/lib/libthr/Makefile head/libexec/rtld-elf/Makefile head/rescue/librescue/Makefile head/rescue/rescue/Makefile head/sys/boot/Makefile.inc head/sys/boot/i386/loader/Makefile head/sys/boot/ia64/common/Makefile head/sys/boot/ia64/efi/Makefile head/sys/boot/ia64/ski/Makefile head/sys/boot/pc98/loader/Makefile head/sys/boot/powerpc/ofw/Makefile head/sys/boot/sparc64/loader/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Feb 21 11:15:38 2009 (r188894) +++ head/Makefile.inc1 Sat Feb 21 15:04:31 2009 (r188895) @@ -230,7 +230,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - -DWITHOUT_SSP \ + SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF @@ -240,8 +240,9 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ + SSP_CFLAGS= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \ - -DNO_WARNS -DNO_CTF -DWITHOUT_SSP + -DNO_WARNS -DNO_CTF # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -458,7 +459,7 @@ build32: .if ${MK_KERBEROS} != "no" .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ ${_t} .endfor .endif @@ -481,7 +482,7 @@ build32: .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ build-tools .endfor cd ${.CURDIR}; \ @@ -782,14 +783,14 @@ buildkernel: @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) .for target in obj depend all cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF ${target} + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target} .endfor .endif .if !defined(NO_KERNELDEPEND) Modified: head/gnu/lib/csu/Makefile ============================================================================== --- head/gnu/lib/csu/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/gnu/lib/csu/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,5 +1,8 @@ # $FreeBSD$ +.include <bsd.own.mk> +MK_SSP= no + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs CCDIR= ${.CURDIR}/../../usr.bin/cc @@ -19,7 +22,6 @@ CFLAGS+= -I${GCCLIB}/include -I${GCCDIR} -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} MKDEP= -DCRT_BEGIN -WITHOUT_SSP= .if ${MACHINE_ARCH} == "ia64" BEGINSRC= crtbegin.asm Modified: head/gnu/lib/libssp/Makefile ============================================================================== --- head/gnu/lib/libssp/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/gnu/lib/libssp/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,5 +1,8 @@ # $FreeBSD$ +.include <bsd.own.mk> +MK_SSP= no + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${GCCLIB}/libssp @@ -10,7 +13,6 @@ LIB= ssp SHLIB_MAJOR= 0 SHLIBDIR?= /lib NO_PROFILE= -WITHOUT_SSP= SRCS= ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \ memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \ Modified: head/lib/csu/Makefile.inc ============================================================================== --- head/lib/csu/Makefile.inc Sat Feb 21 11:15:38 2009 (r188894) +++ head/lib/csu/Makefile.inc Sat Feb 21 15:04:31 2009 (r188895) @@ -1,3 +1,3 @@ # $FreeBSD$ -WITHOUT_SSP= +SSP_CFLAGS= Modified: head/lib/libstand/Makefile ============================================================================== --- head/lib/libstand/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/lib/libstand/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -6,13 +6,15 @@ # quite large. # +.include <bsd.own.mk> +MK_SSP= no + LIB= stand NO_PROFILE= NO_PIC= INCS= stand.h MAN= libstand.3 -WITHOUT_SSP= CFLAGS+= -ffreestanding -Wformat CFLAGS+= -I${.CURDIR} Modified: head/lib/libthr/Makefile ============================================================================== --- head/lib/libthr/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/lib/libthr/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -8,9 +8,8 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no .if ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/libexec/rtld-elf/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no PROG?= ld-elf.so.1 SRCS= rtld_start.S \ Modified: head/rescue/librescue/Makefile ============================================================================== --- head/rescue/librescue/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/rescue/librescue/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -2,9 +2,8 @@ # $FreeBSD$ # -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no # Certain library entries have hard-coded references to # /bin, /sbin, etc, that require those entries to be Modified: head/rescue/rescue/Makefile ============================================================================== --- head/rescue/rescue/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/rescue/rescue/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -2,9 +2,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 NO_MAN= -WITHOUT_SSP= .include <bsd.own.mk> +MK_SSP= no PROG= rescue BINDIR?=/rescue Modified: head/sys/boot/Makefile.inc ============================================================================== --- head/sys/boot/Makefile.inc Sat Feb 21 11:15:38 2009 (r188894) +++ head/sys/boot/Makefile.inc Sat Feb 21 15:04:31 2009 (r188895) @@ -1,3 +1,3 @@ # $FreeBSD$ -WITHOUT_SSP= +SSP_CFLAGS= Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/sys/boot/i386/loader/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no PROG= loader.sym INTERNALPROG= Modified: head/sys/boot/ia64/common/Makefile ============================================================================== --- head/sys/boot/ia64/common/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/sys/boot/ia64/common/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no LIB= ia64 INTERNALLIB= Modified: head/sys/boot/ia64/efi/Makefile ============================================================================== --- head/sys/boot/ia64/efi/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/sys/boot/ia64/efi/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,9 +1,9 @@ # $FreeBSD$ NO_MAN= -WITHOUT_SSP= .include <bsd.own.mk> +MK_SSP= no PROG= loader.sym INTERNALPROG= Modified: head/sys/boot/ia64/ski/Makefile ============================================================================== --- head/sys/boot/ia64/ski/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/sys/boot/ia64/ski/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,9 +1,9 @@ # $FreeBSD$ NO_MAN= -WITHOUT_SSP= .include <bsd.own.mk> +MK_SSP= no PROG= skiload STRIP= # We must not strip skiload at install time. Modified: head/sys/boot/pc98/loader/Makefile ============================================================================== --- head/sys/boot/pc98/loader/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/sys/boot/pc98/loader/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no PROG= loader.sym INTERNALPROG= Modified: head/sys/boot/powerpc/ofw/Makefile ============================================================================== --- head/sys/boot/powerpc/ofw/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/sys/boot/powerpc/ofw/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no PROG= loader NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH} Modified: head/sys/boot/sparc64/loader/Makefile ============================================================================== --- head/sys/boot/sparc64/loader/Makefile Sat Feb 21 11:15:38 2009 (r188894) +++ head/sys/boot/sparc64/loader/Makefile Sat Feb 21 15:04:31 2009 (r188895) @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no PROG= loader NEWVERSWHAT= "bootstrap loader" sparc64
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902211504.n1LF4VIh068864>