diff options
| author | jperkin <jperkin> | 2015-10-20 08:18:12 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-10-20 08:18:12 +0000 |
| commit | 942d03e4094c5e2e5485029628b64b999f8a4481 (patch) | |
| tree | 80e3ad48eff4d1b7bf6e500e4f1864697806ef13 /pkgtools/pkg_install/Makefile | |
| parent | 4d31330488c5d303822749de7407d4f3491bc08d (diff) | |
| download | pkgsrc-942d03e4094c5e2e5485029628b64b999f8a4481.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/Makefile')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 4 |
1 files changed, 2 insertions, 2 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} |