Module Name: src
Committed By: he
Date: Tue Dec 28 09:15:24 UTC 2010
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
src/distrib/sets/lists/tests: mi
Log Message:
Introduce the "ssp" attribute derived from HAS_SSP from <bsd.sys.mk>.
Use it to flag entries which should only be included if the target platform
supports SSP. Fixes the build for a bunch of architectures.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.125 -r1.126 src/distrib/sets/sets.subr
cvs rdiff -u -r1.194 -r1.195 src/distrib/sets/lists/tests/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.3 src/distrib/sets/mkvars.mk:1.4
--- src/distrib/sets/mkvars.mk:1.3 Mon Mar 22 12:03:04 2010
+++ src/distrib/sets/mkvars.mk Tue Dec 28 09:15:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.3 2010/03/22 12:03:04 cegger Exp $
+# $NetBSD: mkvars.mk,v 1.4 2010/12/28 09:15:24 he Exp $
MKEXTRAVARS= \
MACHINE \
@@ -7,6 +7,7 @@
HAVE_BINUTILS \
HAVE_GCC \
HAVE_GDB \
+ HAS_SSP \
OBJECT_FMT \
TOOLCHAIN_MISSING \
EXTSRCS \
@@ -27,6 +28,7 @@
#####
.include <bsd.own.mk>
+.include <bsd.sys.mk>
.if (${MKMAN} == "no" || empty(MANINSTALL:Mmaninstall))
MKMANPAGES=no
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.125 src/distrib/sets/sets.subr:1.126
--- src/distrib/sets/sets.subr:1.125 Wed Dec 8 23:56:01 2010
+++ src/distrib/sets/sets.subr Tue Dec 28 09:15:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.125 2010/12/08 23:56:01 njoly Exp $
+# $NetBSD: sets.subr,v 1.126 2010/12/28 09:15:24 he Exp $
#
#
@@ -19,6 +19,7 @@
# HAVE_BINUTILS
# HAVE_GCC
# HAVE_GDB
+# HAS_SSP
# TOOLCHAIN_MISSING
# OBJECT_FMT
# as well as:
@@ -171,7 +172,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.125 2010/12/08 23:56:01 njoly Exp $
+# # $NetBSD: sets.subr,v 1.126 2010/12/28 09:15:24 he Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -237,6 +238,7 @@
# share ${MKSHARE} != no
# skey ${MKSKEY} != no
# solaris ${MKDTRACE} != no or ${MKZFS} != no
+# ssp ${HAS_SSP} != no
# x11 ${MKX11} != no && ${X11FLAVOUR} != "Xorg"
# xorg ${MKX11} != no && ${X11FLAVOUR} == "Xorg"
# yp ${MKYP} != no
@@ -274,6 +276,7 @@
nv = needvars[vi]
kw = tolower(nv)
sub(/^mk/, "", kw)
+ sub(/^has_/, "", kw)
if (ENVIRON[nv] != "no")
wanted[kw] = 1
}
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.194 src/distrib/sets/lists/tests/mi:1.195
--- src/distrib/sets/lists/tests/mi:1.194 Mon Dec 27 19:35:31 2010
+++ src/distrib/sets/lists/tests/mi Tue Dec 28 09:15:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.194 2010/12/27 19:35:31 pgoyette Exp $
+# $NetBSD: mi,v 1.195 2010/12/28 09:15:24 he Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -327,23 +327,23 @@
./usr/libdata/debug/usr/tests/lib/libc/setjmp tests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/setjmp/t_setjmp.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/ssp tests-lib-debug
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_fgets.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_getcwd.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_gets.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memcpy.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memmove.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memset.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_raw.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_read.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_readlink.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_snprintf.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_sprintf.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strcat.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strcpy.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strncat.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strncpy.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_vsnprintf.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ssp/h_vsprintf.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_fgets.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_getcwd.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_gets.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memcpy.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memmove.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memset.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_raw.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_read.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_readlink.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_snprintf.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_sprintf.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strcat.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strcpy.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strncat.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strncpy.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_vsnprintf.debug tests-lib-debug debug,atf,ssp
+./usr/libdata/debug/usr/tests/lib/libc/ssp/h_vsprintf.debug tests-lib-debug debug,atf,ssp
./usr/libdata/debug/usr/tests/lib/libc/stdio tests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdio/t_format.debug tests-lib-debug debug,atf
@@ -1582,25 +1582,25 @@
./usr/tests/lib/libc/setjmp/Atffile tests-lib-tests atf
./usr/tests/lib/libc/setjmp/t_setjmp tests-lib-tests atf
./usr/tests/lib/libc/ssp tests-lib-tests
-./usr/tests/lib/libc/ssp/Atffile tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_fgets tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_getcwd tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_gets tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_memcpy tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_memmove tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_memset tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_raw tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_read tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_readlink tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_snprintf tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_sprintf tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_strcat tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_strcpy tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_strncat tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_strncpy tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_vsnprintf tests-lib-tests atf
-./usr/tests/lib/libc/ssp/h_vsprintf tests-lib-tests atf
-./usr/tests/lib/libc/ssp/t_ssp tests-lib-tests atf
+./usr/tests/lib/libc/ssp/Atffile tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_fgets tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_getcwd tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_gets tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_memcpy tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_memmove tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_memset tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_raw tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_read tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_readlink tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_snprintf tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_sprintf tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_strcat tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_strcpy tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_strncat tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_strncpy tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_vsnprintf tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/h_vsprintf tests-lib-tests atf,ssp
+./usr/tests/lib/libc/ssp/t_ssp tests-lib-tests atf,ssp
./usr/tests/lib/libc/stdio tests-lib-tests
./usr/tests/lib/libc/stdio/Atffile tests-lib-tests atf
./usr/tests/lib/libc/stdio/t_fmemopen tests-lib-tests atf
