summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorgrant <grant>2006-03-02 03:28:07 +0000
committergrant <grant>2006-03-02 03:28:07 +0000
commitd1251c48caec932691432ba3ff3fd3128bac2d6a (patch)
tree2e2d78379eb5b221cea94cd699c1207c2f7d83a0 /security
parent2cfad7bd25d82d44627e9af810eee2dc6798222c (diff)
downloadpkgsrc-d1251c48caec932691432ba3ff3fd3128bac2d6a.tar.gz
add support for Solaris/i386 and x86_64, and fallback to the configure
script's auto detection for other archs.
Diffstat (limited to 'security')
-rw-r--r--security/openssl/Makefile23
1 files changed, 17 insertions, 6 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 7e59d1b3d11..eb0a8eb99bc 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: Makefile,v 1.114 2006/03/02 03:28:07 grant Exp $
OPENSSL_SNAPSHOT?= # empty
OPENSSL_STABLE?= # empty
@@ -49,12 +49,23 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
CONFIGURE_ARGS+= --openssldir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= shared
-.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
+.if ${OPSYS} == "SunOS"
+. if ${MACHINE_ARCH} == "sparc"
+OPENSSL_MACHINE_ARCH= ${SPARC_TARGET_ARCH}
+. elif ${MACHINE_ARCH} == "i386"
+OPENSSL_MACHINE_ARCH= x86
+. elif ${MACHINE_ARCH} == "x86_64"
+OPENSSL_MACHINE_ARCH= ${MACHINE_ARCH}
+. endif
+# only override the configure target if we know the platform, falling
+# back to ./config's autodetection if not.
+. if defined(OPENSSL_MACHINE_ARCH) && !empty(OPENSSL_MACHINE_ARCH)
CONFIGURE_SCRIPT= ./Configure
-. if !empty(CC_VERSION:Mgcc*)
-CONFIGURE_ARGS+= solaris-${SPARC_TARGET_ARCH}-gcc
-. else
-CONFIGURE_ARGS+= solaris-${SPARC_TARGET_ARCH}-cc
+. if !empty(CC_VERSION:Mgcc*)
+CONFIGURE_ARGS+= solaris-${OPENSSL_MACHINE_ARCH}-gcc
+. else
+CONFIGURE_ARGS+= solaris-${OPENSSL_MACHINE_ARCH}-cc
+. endif
. endif
.elif ${OPSYS} == "IRIX"
CONFIGURE_ARGS+= no-asm