diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-08-24 17:22:58 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-08-24 17:22:58 +0000 |
| commit | b66ca113ff589e13b1ce621aa2ba3f992d4e208b (patch) | |
| tree | a76023cabf1b44330c944d4e56af42bdb80dfc6d | |
| parent | 75fe1c489792b253eb86f42207c4ba8f786a7ce3 (diff) | |
| download | pkgsrc-b66ca113ff589e13b1ce621aa2ba3f992d4e208b.tar.gz | |
Simplify and fix the platform/compiler selection for SunOS. Other
platforms may want to follow suit. Prompted by NetBSD/pkgsrc#12.
| -rw-r--r-- | security/john/Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/security/john/Makefile b/security/john/Makefile index 06ce9938155..a142710d529 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2016/01/28 10:04:38 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2017/08/24 17:22:58 jperkin Exp $ # DISTNAME= john-1.8.0 @@ -19,15 +19,13 @@ TEST_TARGET= check .include "../../mk/bsd.prefs.mk" .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} -. endif +JOHN_ARCH.i386= x86-any +JOHN_ARCH.sparc= sparc +JOHN_ARCH.sparc64= sparcv9 +JOHN_ARCH.x86_64= x86-64 +JOHN_CC.gcc= gcc +JOHN_CC.sunpro= cc +BUILD_TARGET= solaris-${JOHN_ARCH.${MACHINE_ARCH}}-${JOHN_CC.${PKGSRC_COMPILER}} .elif ${OPSYS} == "NetBSD" . if ${MACHINE_ARCH} == "i386" BUILD_TARGET= openbsd-x86-any |