Fri Jul 27 09:44:31 2012 UTC ()
Set default ABI on Solaris for SPARC too.


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

--- pkgsrc/mk/bsd.prefs.mk 2012/07/02 15:49:41 1.324
+++ pkgsrc/mk/bsd.prefs.mk 2012/07/27 09:44:31 1.325
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.324 2012/07/02 15:49:41 jperkin Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.325 2012/07/27 09:44:31 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.
@@ -250,33 +250,33 @@ LOWER_OPSYS?= osf1 @@ -250,33 +250,33 @@ LOWER_OPSYS?= osf1
250LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION} 250LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION}
251LOWER_VENDOR?= dec 251LOWER_VENDOR?= dec
252 252
253.elif ${OPSYS} == "HPUX" 253.elif ${OPSYS} == "HPUX"
254OS_VERSION:= ${OS_VERSION:C/^B.//} 254OS_VERSION:= ${OS_VERSION:C/^B.//}
255.if ${MACHINE_ARCH} == "9000" 255.if ${MACHINE_ARCH} == "9000"
256MACHINE_ARCH= hppa 256MACHINE_ARCH= hppa
257.endif 257.endif
258LOWER_OPSYS?= hpux 258LOWER_OPSYS?= hpux
259LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION} 259LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION}
260LOWER_VENDOR?= hp 260LOWER_VENDOR?= hp
261 261
262.elif ${OPSYS} == "SunOS" 262.elif ${OPSYS} == "SunOS"
 263ABI?= 32
263. if ${MACHINE_ARCH} == "sparc" 264. if ${MACHINE_ARCH} == "sparc"
264SPARC_TARGET_ARCH?= sparcv7 265SPARC_TARGET_ARCH?= sparcv7
265. elif ${MACHINE_ARCH} == "sun4" 266. elif ${MACHINE_ARCH} == "sun4"
266MACHINE_ARCH= sparc 267MACHINE_ARCH= sparc
267SPARC_TARGET_ARCH?= sparcv7 268SPARC_TARGET_ARCH?= sparcv7
268. elif ${MACHINE_ARCH} == "i86pc" || ${MACHINE_ARCH} == "i86xpv" || ${MACHINE_ARCH} == "i386" 269. elif ${MACHINE_ARCH} == "i86pc" || ${MACHINE_ARCH} == "i86xpv" || ${MACHINE_ARCH} == "i386"
269ABI?= 32 
270LOWER_ARCH.32= i386 270LOWER_ARCH.32= i386
271LOWER_ARCH.64= x86_64 271LOWER_ARCH.64= x86_64
272LOWER_ARCH= ${LOWER_ARCH.${ABI}} 272LOWER_ARCH= ${LOWER_ARCH.${ABI}}
273MACHINE_ARCH= ${LOWER_ARCH} 273MACHINE_ARCH= ${LOWER_ARCH}
274. elif ${MACHINE_ARCH} == "unknown" 274. elif ${MACHINE_ARCH} == "unknown"
275. if !defined(LOWER_ARCH) 275. if !defined(LOWER_ARCH)
276LOWER_ARCH!= ${UNAME} -p 276LOWER_ARCH!= ${UNAME} -p
277. endif # !defined(LOWER_ARCH) 277. endif # !defined(LOWER_ARCH)
278MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q} 278MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
279. endif 279. endif
280LOWER_VENDOR?= sun 280LOWER_VENDOR?= sun
281LOWER_OPSYS?= solaris 281LOWER_OPSYS?= solaris
282LOWER_OPSYS_VERSUFFIX= 2.${OS_VERSION:C/5.//} 282LOWER_OPSYS_VERSUFFIX= 2.${OS_VERSION:C/5.//}