From fce78c05d2b89e39cbed6550f41cfcb953a79b76 Mon Sep 17 00:00:00 2001 From: jperkin Date: Sun, 24 Jan 2016 16:14:44 +0000 Subject: 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. --- x11/elementary/Makefile | 4 ++-- x11/enlightenment/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'x11') diff --git a/x11/elementary/Makefile b/x11/elementary/Makefile index 97fe61adf51..40789609a67 100644 --- a/x11/elementary/Makefile +++ b/x11/elementary/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/12/29 04:54:38 dholland Exp $ +# $NetBSD: Makefile,v 1.8 2016/01/24 16:14:45 jperkin Exp $ DISTNAME= elementary-1.7.7 PKGREVISION= 4 @@ -26,7 +26,7 @@ MAKEFLAGS+= AUTOMAKE="automake -af" PKGCONFIG_OVERRIDE= elementary # currently it is like it is -MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH}-1.7.7 +MODULE_ARCH= ${LOWER_OPSYS}-${MACHINE_ARCH}-1.7.7 PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH} PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile index 909528882b7..f771eae36df 100644 --- a/x11/enlightenment/Makefile +++ b/x11/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2015/12/29 04:54:38 dholland Exp $ +# $NetBSD: Makefile,v 1.37 2016/01/24 16:14:45 jperkin Exp $ # DISTNAME= enlightenment-0.17.3 @@ -54,7 +54,7 @@ pre-install: PKGCONFIG_OVERRIDE= enlightenment.pc.in -MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH}-${PKGVERSION_NOREV} +MODULE_ARCH= ${LOWER_OPSYS}-${MACHINE_ARCH}-${PKGVERSION_NOREV} PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH} PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } -- cgit v1.2.3