diff options
| author | jperkin <jperkin> | 2015-10-20 08:18:12 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-10-20 08:18:12 +0000 |
| commit | fcc75f4cb6f70b14370c917222fae3ddee7d45b7 (patch) | |
| tree | 80e3ad48eff4d1b7bf6e500e4f1864697806ef13 /pkgtools/pkg_install | |
| parent | 7b57b926a833e5464dd81562a670e623dc5ed22c (diff) | |
| download | pkgsrc-fcc75f4cb6f70b14370c917222fae3ddee7d45b7.tar.gz | |
OpenBSD and derivatives define MACHINE_ARCH in sys/param.h to "amd64" which
overrides our attempt to set it to "x86_64" and ensure consistency across
platforms. Work around this by setting it using PKGSRC_MACHINE_ARCH.
Confirmed to fix the issue and not break a variety of other platforms by
Sevan, and approved under duress by Joerg.
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/add/Makefile.in | 4 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index b6be8b52d52..680e14d339e 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.211 2015/09/07 09:06:04 jperkin Exp $ +# $NetBSD: Makefile,v 1.212 2015/10/20 08:18:12 jperkin Exp $ # Notes to package maintainers: # @@ -76,7 +76,7 @@ CPPFLAGS+= -D_FILE_OFFSET_BITS=64 CPPFLAGS+= -DDEF_UMASK=${DEF_UMASK} -MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +MAKE_ENV+= PKGSRC_MACHINE_ARCH=${MACHINE_ARCH} MAKE_ENV+= OPSYS=${OPSYS} MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q} MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in index 7f5be93f8b3..c9078510536 100644 --- a/pkgtools/pkg_install/files/add/Makefile.in +++ b/pkgtools/pkg_install/files/add/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.31 2015/09/07 09:06:04 jperkin Exp $ +# $NetBSD: Makefile.in,v 1.32 2015/10/20 08:18:12 jperkin Exp $ srcdir= @srcdir@ @@ -14,7 +14,7 @@ cat1dir= $(mandir)/cat1 CC= @CC@ CCLD= $(CC) CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib -DEFS= @DEFS@ -DOPSYS_NAME=\"$(OPSYS)\" -DMACHINE_ARCH=\"$(MACHINE_ARCH)\" -DBINDIR=\"$(sbindir)\" +DEFS= @DEFS@ -DOPSYS_NAME=\"$(OPSYS)\" -DPKGSRC_MACHINE_ARCH=\"$(PKGSRC_MACHINE_ARCH)\" -DBINDIR=\"$(sbindir)\" CFLAGS= @CFLAGS@ LDFLAGS= @LDFLAGS@ -L../lib diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 9e480036adb..c207a719848 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.106 2014/12/30 15:13:20 wiz Exp $ */ +/* $NetBSD: perform.c,v 1.107 2015/10/20 08:18:12 jperkin Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif -__RCSID("$NetBSD: perform.c,v 1.106 2014/12/30 15:13:20 wiz Exp $"); +__RCSID("$NetBSD: perform.c,v 1.107 2015/10/20 08:18:12 jperkin Exp $"); /*- * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org> @@ -907,7 +907,7 @@ check_platform(struct pkg_task *pkg) if (OverrideMachine != NULL) effective_arch = OverrideMachine; else - effective_arch = MACHINE_ARCH; + effective_arch = PKGSRC_MACHINE_ARCH; /* If either the OS or arch are different, bomb */ if (strcmp(OPSYS_NAME, pkg->buildinfo[BI_OPSYS]) || |