Thu Jun 14 21:57:37 2012 UTC ()
Set a default Solaris/x86 ABI, restores previous behaviour when bootstrap
is ran without --abi.


(jperkin)
diff -r1.322 -r1.323 pkgsrc/mk/bsd.prefs.mk
cvs diff -r1.322 -r1.323 pkgsrc/mk/bsd.prefs.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.prefs.mk 2012/06/11 09:36:02 1.322
+++ pkgsrc/mk/bsd.prefs.mk 2012/06/14 21:57:37 1.323
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.322 2012/06/11 09:36:02 jperkin Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.323 2012/06/14 21:57:37 jperkin Exp $
2# 2#
3# This file includes the mk.conf file, which contains the user settings. 3# This file includes the mk.conf file, which contains the user settings.
4# 4#
5# Packages should include this file before any of the .if directives, as 5# Packages should include this file before any of the .if directives, as
6# well as before modifying variables like CFLAGS, LDFLAGS, and so on. 6# well as before modifying variables like CFLAGS, LDFLAGS, and so on.
7# Otherwise the behavior may be unexpected. 7# Otherwise the behavior may be unexpected.
8# 8#
9# When mk.conf is included by this file, the following variables are 9# When mk.conf is included by this file, the following variables are
10# defined: 10# defined:
11# 11#
12# ACCEPTABLE_LICENSES 12# ACCEPTABLE_LICENSES
13# This variable is set to the list of Open Source licenses. See 13# This variable is set to the list of Open Source licenses. See
14# mk/license.mk for details. 14# mk/license.mk for details.
@@ -251,26 +251,27 @@ OS_VERSION:= ${OS_VERSION:C/^B.//} @@ -251,26 +251,27 @@ OS_VERSION:= ${OS_VERSION:C/^B.//}
251MACHINE_ARCH= hppa 251MACHINE_ARCH= hppa
252.endif 252.endif
253LOWER_OPSYS?= hpux 253LOWER_OPSYS?= hpux
254LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION} 254LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION}
255LOWER_VENDOR?= hp 255LOWER_VENDOR?= hp
256 256
257.elif ${OPSYS} == "SunOS" 257.elif ${OPSYS} == "SunOS"
258. if ${MACHINE_ARCH} == "sparc" 258. if ${MACHINE_ARCH} == "sparc"
259SPARC_TARGET_ARCH?= sparcv7 259SPARC_TARGET_ARCH?= sparcv7
260. elif ${MACHINE_ARCH} == "sun4" 260. elif ${MACHINE_ARCH} == "sun4"
261MACHINE_ARCH= sparc 261MACHINE_ARCH= sparc
262SPARC_TARGET_ARCH?= sparcv7 262SPARC_TARGET_ARCH?= sparcv7
263. elif ${MACHINE_ARCH} == "i86pc" || ${MACHINE_ARCH} == "i86xpv" || ${MACHINE_ARCH} == "i386" 263. elif ${MACHINE_ARCH} == "i86pc" || ${MACHINE_ARCH} == "i86xpv" || ${MACHINE_ARCH} == "i386"
 264ABI?= 32
264LOWER_ARCH.32= i386 265LOWER_ARCH.32= i386
265LOWER_ARCH.64= x86_64 266LOWER_ARCH.64= x86_64
266LOWER_ARCH= ${LOWER_ARCH.${ABI}} 267LOWER_ARCH= ${LOWER_ARCH.${ABI}}
267MACHINE_ARCH= ${LOWER_ARCH} 268MACHINE_ARCH= ${LOWER_ARCH}
268. elif ${MACHINE_ARCH} == "unknown" 269. elif ${MACHINE_ARCH} == "unknown"
269. if !defined(LOWER_ARCH) 270. if !defined(LOWER_ARCH)
270LOWER_ARCH!= ${UNAME} -p 271LOWER_ARCH!= ${UNAME} -p
271. endif # !defined(LOWER_ARCH) 272. endif # !defined(LOWER_ARCH)
272MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q} 273MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
273. endif 274. endif
274LOWER_VENDOR?= sun 275LOWER_VENDOR?= sun
275LOWER_OPSYS?= solaris 276LOWER_OPSYS?= solaris
276LOWER_OPSYS_VERSUFFIX= 2.${OS_VERSION:C/5.//} 277LOWER_OPSYS_VERSUFFIX= 2.${OS_VERSION:C/5.//}