Attempt to bring sanity to how ABI and MACHINE_ARCH are set.

Previously there were at least 5 different ways MACHINE_ARCH could be set,
some statically and some at run time, and in many cases these settings
differed, leading to issues at pkg_add time where there was conflict
between the setting encoded into the package and that used by pkg_install.

Instead, move to a single source of truth where the correct value based on
the host and the chosen (or default) ABI is determined in the bootstrap
script.  The value can still be overridden in mk.conf if necessary, e.g.
for cross-compiling.

ABI is now set by default and if unset a default is calculated based on
MACHINE_ARCH.  This fixes some OS, e.g. Linux, where the wrong default was
previously chosen.

As a result of the refactoring there is no need for LOWER_ARCH, with
references to it replaced by MACHINE_ARCH.  SPARC_TARGET_ARCH is also
removed.

3 files changed, 16 insertions, 17 deletions

diff --git a/security/john/Makefile b/security/john/Makefile
index 7577148f922..53567bdfa9a 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/09/14 13:20:08 shattered Exp $
+# $NetBSD: Makefile,v 1.23 2016/01/24 16:14:45 jperkin Exp $
 #
 
 DISTNAME=	john-1.8.0
@@ -18,18 +18,15 @@ TEST_TARGET=	check
 .include "../../mk/compiler.mk"
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
-.  if !empty(CC_VERSION:MSun)
-.    if defined(SPARC_TARGET_ARCH) && ${SPARC_TARGET_ARCH} == "sparcv9"
-BUILD_TARGET=	solaris-sparc-v9-cc
-.    else
-BUILD_TARGET=	solaris-sparc-v8-cc
-.    endif
-.  else
-BUILD_TARGET=	solaris-sparc-gcc
-.  endif
-.elif ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386"
-BUILD_TARGET=	solaris-x86-any
+.if ${OPSYS} == "SunOS"
+.  if ${MACHINE_ARCH} == "sparc"
+BUILD_TARGET=	solaris-sparc-${${PKGSRC_COMPILER}==gcc:?gcc:cc}
+.  elif ${MACHINE_ARCH} == "sparc64"
+BUILD_TARGET=	solaris-sparcv9-${${PKGSRC_COMPILER}==gcc:?gcc:cc}
+.  elif ${MACHINE_ARCH} == "i386"
+BUILD_TARGET=	solaris-x86-any-${${PKGSRC_COMPILER}==gcc:?gcc:cc}
+.  elif ${MACHINE_ARCH} == "x86_64"
+BUILD_TARGET=	solaris-x86_64-${${PKGSRC_COMPILER}==gcc:?gcc:cc}
 .elif ${OPSYS} == "NetBSD"
 .  if ${MACHINE_ARCH} == "i386"
 BUILD_TARGET=	openbsd-x86-any
diff --git a/security/libbf/Makefile b/security/libbf/Makefile
index f5b6ab3b3e7..b7d73a53c27 100644
--- a/security/libbf/Makefile
+++ b/security/libbf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/04/08 11:17:21 rodent Exp $
+# $NetBSD: Makefile,v 1.17 2016/01/24 16:14:45 jperkin Exp $
 #
 
 DISTNAME=	libbf-0.8.2b
@@ -14,7 +14,7 @@ CRYPTO=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${LOWER_ARCH} == "i386" && ${OBJECT_FMT} == "ELF"
+.if ${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} == "ELF"
 BF_ENC=asm/bx86-elf.o
 .else
 BF_ENC=bf_enc.o
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 0d159280efb..17d2cb0b597 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218 2015/12/11 10:20:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.219 2016/01/24 16:14:45 jperkin Exp $
 
 DISTNAME=	openssl-1.0.2e
 CATEGORIES=	security
@@ -40,7 +40,9 @@ CC=			gcc
 
 .if ${OPSYS} == "SunOS"
 .  if ${MACHINE_ARCH} == "sparc"
-OPENSSL_MACHINE_ARCH=	${SPARC_TARGET_ARCH}
+OPENSSL_MACHINE_ARCH=	sparcv7
+.  elif ${MACHINE_ARCH} == "sparc64"
+OPENSSL_MACHINE_ARCH=	sparcv9
 .  elif ${MACHINE_ARCH} == "i386"
 OPENSSL_MACHINE_ARCH=	x86
 .  elif ${MACHINE_ARCH} == "x86_64"