[pkgsrc/trunk]: pkgsrc/mk Unconditionally set the default ABI to 32-Bit for M...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aee8fbddbc36
branches:  trunk
changeset: 565521:aee8fbddbc36
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Sep 24 17:24:13 2009 +0000

description:
Unconditionally set the default ABI to 32-Bit for Mac OS X Snow Leopard.
There are too many third party applications which don't build using
the 64-Bit ABI at the moment.

Approved by Alistair Crooks.

diffstat:

 mk/bsd.prefs.mk |  17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diffs (32 lines):

diff -r d3b1383bca03 -r aee8fbddbc36 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Thu Sep 24 15:53:12 2009 +0000
+++ b/mk/bsd.prefs.mk   Thu Sep 24 17:24:13 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.299 2009/09/22 19:19:29 hasso Exp $
+# $NetBSD: bsd.prefs.mk,v 1.300 2009/09/24 17:24:13 tron Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -124,12 +124,17 @@
 .elif ${OPSYS} == "Darwin"
 LOWER_OPSYS?=          darwin
 .if empty(OS_VERSION:M[1-9].*.*)
-_SYSCTL_HW_OPTIONAL_X86_64!=   /usr/sbin/sysctl -n hw.optional.x86_64
-.  if ${_SYSCTL_HW_OPTIONAL_X86_64} == "1"
-ABI=                   64
-.else
+# Automatically select the ABI under Mac OS X Snow Leopard. We don't
+# use this at the moment because too many third party programs don't
+# work with it.
+#
+# _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
 ABI=                   32
-.  endif
 LOWER_ARCH.32=         i386
 LOWER_ARCH.64=         x86_64
 LOWER_ARCH=            ${LOWER_ARCH.${ABI}}