pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/openssl Overhaul the platform selector logic, ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b9a5c22e9345
branches:  trunk
changeset: 366183:b9a5c22e9345
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Aug 05 11:06:29 2017 +0000

description:
Overhaul the platform selector logic, so that the right value is selected
for powerpc64 on Darwin. Fix for PR pkg/52114.

diffstat:

 security/openssl/Makefile |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r ebf4b74b4661 -r b9a5c22e9345 security/openssl/Makefile
--- a/security/openssl/Makefile Sat Aug 05 10:45:39 2017 +0000
+++ b/security/openssl/Makefile Sat Aug 05 11:06:29 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.230 2017/01/26 16:31:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.231 2017/08/05 11:06:29 bsiegert Exp $
 
 DISTNAME=      openssl-1.0.2k
 CATEGORIES=    security
@@ -78,12 +78,16 @@
 .elif ${OPSYS} == "Darwin"
 CONFIGURE_SCRIPT=      ./Configure
 .  if defined(ABI) && ${ABI} == "64"
-CONFIGURE_ARGS+=       darwin64-${MACHINE_ARCH}-cc
-.  elif ${MACHINE_ARCH} == "powerpc"
-CONFIGURE_ARGS+=       darwin-ppc-cc
+_OS=                   darwin64
 .  else
-CONFIGURE_ARGS+=       darwin-${MACHINE_ARCH}-cc
+_OS=                   darwin
 .  endif
+.  if ${MACHINE_ARCH:Mpowerpc*}
+_ARCH=                 ppc
+.  else
+_ARCH=                 ${MACHINE_ARCH}
+.endif
+CONFIGURE_ARGS+=       ${_OS}-${_ARCH}-cc
 
 SUBST_CLASSES+=                dl
 SUBST_MESSAGE.dl=      Adding dynamic link compatibility library.



Home | Main Index | Thread Index | Old Index