Sat Nov 15 13:06:42 2008 UTC ()
remove NetBSD-specific code from OpenBSD's bsd.own.mk


(schwarz)
diff -r1.2 -r1.3 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in 2008/11/15 13:05:09 1.2
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in 2008/11/15 13:06:42 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: OpenBSD.bsd.own.mk.in,v 1.2 2008/11/15 13:05:09 schwarz Exp $ 1# $NetBSD: OpenBSD.bsd.own.mk.in,v 1.3 2008/11/15 13:06:42 schwarz Exp $
2 2
3.if !defined(_BSD_OWN_MK_) 3.if !defined(_BSD_OWN_MK_)
4_BSD_OWN_MK_=1 4_BSD_OWN_MK_=1
5 5
6# XXX On systems with a Berkeley-style make, perhaps we ought to check 6# XXX On systems with a Berkeley-style make, perhaps we ought to check
7# XXX for and source a file other than /etc/mk.conf 7# XXX for and source a file other than /etc/mk.conf
8 8
9.if defined(MAKECONF) && exists(${MAKECONF}) 9.if defined(MAKECONF) && exists(${MAKECONF})
10.include "${MAKECONF}" 10.include "${MAKECONF}"
11.elif exists(@SYSCONFDIR@/mk.conf) 11.elif exists(@SYSCONFDIR@/mk.conf)
12.include "@SYSCONFDIR@/mk.conf" 12.include "@SYSCONFDIR@/mk.conf"
13.elif exists(/etc/mk.conf) 13.elif exists(/etc/mk.conf)
14.include "/etc/mk.conf" 14.include "/etc/mk.conf"
@@ -129,39 +129,26 @@ GNU_ARCH.i386=i386 @@ -129,39 +129,26 @@ GNU_ARCH.i386=i386
129GNU_ARCH.m68k=m68k 129GNU_ARCH.m68k=m68k
130GNU_ARCH.mipseb=mipseb 130GNU_ARCH.mipseb=mipseb
131GNU_ARCH.mipsel=mipsel 131GNU_ARCH.mipsel=mipsel
132GNU_ARCH.ns32k=ns32k 132GNU_ARCH.ns32k=ns32k
133GNU_ARCH.powerpc=powerpc 133GNU_ARCH.powerpc=powerpc
134GNU_ARCH.sh3eb=sh 134GNU_ARCH.sh3eb=sh
135GNU_ARCH.sh3el=sh 135GNU_ARCH.sh3el=sh
136GNU_ARCH.sparc=sparc 136GNU_ARCH.sparc=sparc
137GNU_ARCH.sparc64=sparc64 137GNU_ARCH.sparc64=sparc64
138GNU_ARCH.vax=vax 138GNU_ARCH.vax=vax
139MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}} 139MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}}
140.endif 140.endif
141 141
142# In order to identify NetBSD to GNU packages, we sometimes need 
143# an "elf" tag for historically a.out platforms. 
144.if ${OBJECT_FMT} == "ELF" && \ 
145 (${MACHINE_ARCH} == "arm" || \ 
146 ${MACHINE_ARCH} == "i386" || \ 
147 ${MACHINE_ARCH} == "m68k" || \ 
148 ${MACHINE_ARCH} == "sparc" || \ 
149 ${MACHINE_ARCH} == "vax") 
150MACHINE_GNU_PLATFORM?= netbsdelf 
151.else 
152MACHINE_GNU_PLATFORM?= netbsd 
153.endif 
154 
155# CPU model, derived from MACHINE_ARCH 142# CPU model, derived from MACHINE_ARCH
156MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:S/arm26/arm/:S/arm32/arm/:C/sh3e[bl]/sh3/:S/m68000/m68k/} 143MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:S/arm26/arm/:S/arm32/arm/:C/sh3e[bl]/sh3/:S/m68000/m68k/}
157 144
158.if ${MACHINE_ARCH} == "mips" 145.if ${MACHINE_ARCH} == "mips"
159.BEGIN: 146.BEGIN:
160 @echo Must set MACHINE_ARCH to one of mipseb or mipsel 147 @echo Must set MACHINE_ARCH to one of mipseb or mipsel
161 @false 148 @false
162.endif 149.endif
163.if ${MACHINE_ARCH} == "sh3" 150.if ${MACHINE_ARCH} == "sh3"
164.BEGIN: 151.BEGIN:
165 @echo Must set MACHINE_ARCH to one of sh3eb or sh3el 152 @echo Must set MACHINE_ARCH to one of sh3eb or sh3el
166 @false 153 @false
167.endif 154.endif