From 781d54866d81f8d515861c1dea3ad75536fb3b45 Mon Sep 17 00:00:00 2001 From: deraadt Date: Sun, 11 Jun 2017 22:51:21 +0000 Subject: [PATCH] make vers.o not depend on gap.o using a trick, because it is piece of fiction participating only in the linkphase. tricks from rpe and espie --- sys/arch/alpha/conf/Makefile.alpha | 4 ++-- sys/arch/amd64/conf/Makefile.amd64 | 4 ++-- sys/arch/arm64/conf/Makefile.arm64 | 4 ++-- sys/arch/armv7/conf/Makefile.armv7 | 4 ++-- sys/arch/hppa/conf/Makefile.hppa | 4 ++-- sys/arch/i386/conf/Makefile.i386 | 4 ++-- sys/arch/landisk/conf/Makefile.landisk | 4 ++-- sys/arch/loongson/conf/Makefile.loongson | 4 ++-- sys/arch/luna88k/conf/Makefile.luna88k | 4 ++-- sys/arch/macppc/conf/Makefile.macppc | 4 ++-- sys/arch/octeon/conf/Makefile.octeon | 4 ++-- sys/arch/sgi/conf/Makefile.sgi | 4 ++-- sys/arch/socppc/conf/Makefile.socppc | 4 ++-- sys/arch/sparc64/conf/Makefile.sparc64 | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index a023c77df3d..deca2ef35e0 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.99 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.alpha,v 1.100 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -121,7 +121,7 @@ ioconf.o: ioconf.c ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index a2fbe3f46a1..f91d588bff6 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.82 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.amd64,v 1.83 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -124,7 +124,7 @@ ioconf.o: ioconf.c ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64 index e1914c653e9..f9fa3685748 100644 --- a/sys/arch/arm64/conf/Makefile.arm64 +++ b/sys/arch/arm64/conf/Makefile.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.arm64,v 1.12 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.arm64,v 1.13 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -124,7 +124,7 @@ ld.script: ${_archdir}/conf/kern.ldscript sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \ -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ld.script -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7 index c4ab27f3b2c..de7f7c52ba6 100644 --- a/sys/arch/armv7/conf/Makefile.armv7 +++ b/sys/arch/armv7/conf/Makefile.armv7 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armv7,v 1.24 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.armv7,v 1.25 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -117,7 +117,7 @@ ld.script: ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \ -e 's/(KERNEL_BASE_phys)/(KERNEL_BASE_virt)/' > ld.script -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index 43787320a68..4ce493dfb09 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.93 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.hppa,v 1.94 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -129,7 +129,7 @@ ioconf.o: ioconf.c ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 0429ab14583..04c45e8ea42 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.108 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.i386,v 1.109 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -125,7 +125,7 @@ ioconf.o: ioconf.c ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index 5207acdeef7..7f56faee71b 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.64 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.landisk,v 1.65 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -118,7 +118,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson index b8947b2853f..fc93bd98706 100644 --- a/sys/arch/loongson/conf/Makefile.loongson +++ b/sys/arch/loongson/conf/Makefile.loongson @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.loongson,v 1.58 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.loongson,v 1.59 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -126,7 +126,7 @@ ioconf.o: ioconf.c ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k index 03a2309c5c7..6a62f5a58da 100644 --- a/sys/arch/luna88k/conf/Makefile.luna88k +++ b/sys/arch/luna88k/conf/Makefile.luna88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.luna88k,v 1.69 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.luna88k,v 1.70 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -120,7 +120,7 @@ ioconf.o: ioconf.c ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index ce5b16610d9..a5edef7ea7a 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.81 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.macppc,v 1.82 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -113,7 +113,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon index 92d5b76da0e..102664e1cdb 100644 --- a/sys/arch/octeon/conf/Makefile.octeon +++ b/sys/arch/octeon/conf/Makefile.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.octeon,v 1.34 2017/06/11 20:50:32 bluhm Exp $ +# $OpenBSD: Makefile.octeon,v 1.35 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -127,7 +127,7 @@ ioconf.o: ioconf.c ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index c2942b57f92..6bddf6ea7e5 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.82 2017/06/11 20:50:33 bluhm Exp $ +# $OpenBSD: Makefile.sgi,v 1.83 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -126,7 +126,7 @@ ioconf.o: ioconf.c ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc index 4e2dc9afd4d..5f036159342 100644 --- a/sys/arch/socppc/conf/Makefile.socppc +++ b/sys/arch/socppc/conf/Makefile.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.socppc,v 1.52 2017/06/11 20:50:33 bluhm Exp $ +# $OpenBSD: Makefile.socppc,v 1.53 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -113,7 +113,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index 8bac1700052..55c1ba54210 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc64,v 1.84 2017/06/11 20:50:33 bluhm Exp $ +# $OpenBSD: Makefile.sparc64,v 1.85 2017/06/11 22:51:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -114,7 +114,7 @@ ioconf.o: ioconf.c ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ -vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c -- 2.20.1