kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set MACHINE_ARCH=x86_64 when ABI=64 on Solaris/x86, required for packages

Browse source 
such as devel/gmp which do their own ABI determination.

Full clean bulk build with this change:

  http://mail-index.netbsd.org/pkgsrc-bulk/2012/06/11/msg008920.html

looks good.
This commit is contained in:
jperkin 2012-06-11 09:36:02 +00:00
parent 832b47f049
commit ef8a25c526
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mk/bsd.prefs.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.prefs.mk,v 1.321 2012/03/19 12:34:15 joerg Exp $
# $NetBSD: bsd.prefs.mk,v 1.322 2012/06/11 09:36:02 jperkin Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@ -260,8 +260,11 @@ SPARC_TARGET_ARCH?= sparcv7
. elif ${MACHINE_ARCH} == "sun4"
MACHINE_ARCH= sparc
SPARC_TARGET_ARCH?= sparcv7
. elif ${MACHINE_ARCH} == "i86pc" || ${MACHINE_ARCH} == "i86xpv"
MACHINE_ARCH= i386
. elif ${MACHINE_ARCH} == "i86pc" || ${MACHINE_ARCH} == "i86xpv" || ${MACHINE_ARCH} == "i386"
LOWER_ARCH.32= i386
LOWER_ARCH.64= x86_64
LOWER_ARCH= ${LOWER_ARCH.${ABI}}
MACHINE_ARCH= ${LOWER_ARCH}
. elif ${MACHINE_ARCH} == "unknown"
. if !defined(LOWER_ARCH)
LOWER_ARCH!= ${UNAME} -p