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

Try to fix Mac OS X Snow Leopard ABI issue (32-bit vs. 64-bit):

Browse source 
1.) Always set the "ABI" variable.
2.) Default to 64-bit mode if the machine is able to run 64-bit binaries.
    This seems to match the default behavior of Xcode (Apple's toolchain).
3.) Set "LOWER_ARCH" based on the ABI we are compiling for, not on
    based on the kernel the machine is running.

The "gnupg" package now builds for the 64-Bit API without extra tricks.
This commit is contained in:
tron 2009-09-21 10:56:08 +00:00
parent 36e084abba
commit 66d67cdc56
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mk/bsd.prefs.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.prefs.mk,v 1.295 2009/09/13 13:28:46 tron Exp $
# $NetBSD: bsd.prefs.mk,v 1.296 2009/09/21 10:56:08 tron Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@ -123,7 +123,25 @@ LOWER_OPSYS?= bsdi
.elif ${OPSYS} == "Darwin"
LOWER_OPSYS?= darwin
.if empty(OS_VERSION:M[1-9].*.*)
# Determine the ABI under Mac OS X Snow Leopard and adjust
# the machine archicture accordingly.
. if !defined(ABI)
_SYSCTL_HW_OPTIONAL_X86_64!= /usr/sbin/sysctl -n hw.optional.x86_64
. if ${_SYSCTL_HW_OPTIONAL_X86_64} == "1"
ABI= 64
.else
ABI= 32
. endif
. endif
.if ${ABI} == "32"
LOWER_ARCH= i386
.else
LOWER_ARCH= x86_64
.endif
.else
LOWER_ARCH!= ${UNAME} -p
.endif
MACHINE_ARCH= ${LOWER_ARCH}
MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
LOWER_OPSYS_VERSUFFIX= ${LOWER_OS_VERSION:C/([0-9]*).*/\1/}