d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build when WITH_SSP is set explicitly.

Browse Source 
Submitted by:	Jeremie Le Hen
This commit is contained in:
Ruslan Ermilov 2009-02-21 15:04:31 +00:00
parent 613042491b
commit d9ca85fca7
17 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.inc1
View File

@ -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)

4
gnu/lib/csu/Makefile
View File

@ -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}/config -I${GCCDIR} -I. \
-I${CCDIR}/cc_tools
CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG}
MKDEP= -DCRT_BEGIN
WITHOUT_SSP=
.if ${MACHINE_ARCH} == "ia64"
BEGINSRC= crtbegin.asm

4
gnu/lib/libssp/Makefile
View File

@ -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 \

2
lib/csu/Makefile.inc
View File

@ -1,3 +1,3 @@
# $FreeBSD$
WITHOUT_SSP=
SSP_CFLAGS=

4
lib/libstand/Makefile
View File

@ -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}

3
lib/libthr/Makefile
View File

@ -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

3
libexec/rtld-elf/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
WITHOUT_SSP=
.include <bsd.own.mk>
MK_SSP= no
PROG?= ld-elf.so.1
SRCS= rtld_start.S \

3
rescue/librescue/Makefile
View File

@ -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

2
rescue/rescue/Makefile
View File

@ -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

2
sys/boot/Makefile.inc
View File

@ -1,3 +1,3 @@
# $FreeBSD$
WITHOUT_SSP=
SSP_CFLAGS=

3
sys/boot/i386/loader/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
WITHOUT_SSP=
.include <bsd.own.mk>
MK_SSP= no
PROG= loader.sym
INTERNALPROG=

3
sys/boot/ia64/common/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
WITHOUT_SSP=
.include <bsd.own.mk>
MK_SSP= no
LIB= ia64
INTERNALLIB=

2
sys/boot/ia64/efi/Makefile
View File

@ -1,9 +1,9 @@
# $FreeBSD$
NO_MAN=
WITHOUT_SSP=
.include <bsd.own.mk>
MK_SSP= no
PROG= loader.sym
INTERNALPROG=

2
sys/boot/ia64/ski/Makefile
View File

@ -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.

3
sys/boot/pc98/loader/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
WITHOUT_SSP=
.include <bsd.own.mk>
MK_SSP= no
PROG= loader.sym
INTERNALPROG=

3
sys/boot/powerpc/ofw/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
WITHOUT_SSP=
.include <bsd.own.mk>
MK_SSP= no
PROG= loader
NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH}

3
sys/boot/sparc64/loader/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
WITHOUT_SSP=
.include <bsd.own.mk>
MK_SSP= no
PROG= loader
NEWVERSWHAT= "bootstrap loader" sparc64