[pkgsrc/trunk]: pkgsrc/security/openssl Unbreak security/openssl build on pre...

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/824f498c66c5
branches:  trunk
changeset: 435604:824f498c66c5
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Fri Jul 10 10:04:54 2020 +0000

description:
Unbreak security/openssl build on pre-v9 Darwin.

(1) There is no {get,make,set}context support before Darwin 9

(2) Instead of failing the build on makedepend(8) malfunction, have
make(1) ignore its return value - which used to be the default for
previous OpenSSL versions.

diffstat:

 security/openssl/Makefile                |   9 ++++++++-
 security/openssl/distinfo                |   3 ++-
 security/openssl/patches/patch-Configure |  23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diffs (65 lines):

diff -r f7a5b9477b7f -r 824f498c66c5 security/openssl/Makefile
--- a/security/openssl/Makefile Fri Jul 10 09:13:06 2020 +0000
+++ b/security/openssl/Makefile Fri Jul 10 10:04:54 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.259 2020/05/21 10:41:36 nia Exp $
+# $NetBSD: Makefile,v 1.260 2020/07/10 10:04:54 hauke Exp $
 
 DISTNAME=      openssl-1.1.1g
 PKGREVISION=   1
@@ -23,6 +23,13 @@
 CONFIGURE_ARGS+=       --openssldir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       shared
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-powerpc)
+# No {get,make,set}context support before Darwin 9
+CONFIGURE_ARGS+=       no-async
+.endif
+
 .include "options.mk"
 
 CONFIGURE_ARGS+=       ${CFLAGS} ${LDFLAGS}
diff -r f7a5b9477b7f -r 824f498c66c5 security/openssl/distinfo
--- a/security/openssl/distinfo Fri Jul 10 09:13:06 2020 +0000
+++ b/security/openssl/distinfo Fri Jul 10 10:04:54 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.142 2020/05/23 10:32:06 jperkin Exp $
+$NetBSD: distinfo,v 1.143 2020/07/10 10:04:54 hauke Exp $
 
 SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997
 RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d
@@ -6,4 +6,5 @@
 Size (openssl-1.1.1g.tar.gz) = 9801502 bytes
 SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da
+SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2
 SHA1 (patch-crypto_rand_rand__unix.c) = 9aa1ff0b0ff1db3fcadacf8707596a7db852f956
diff -r f7a5b9477b7f -r 824f498c66c5 security/openssl/patches/patch-Configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssl/patches/patch-Configure  Fri Jul 10 10:04:54 2020 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-Configure,v 1.10 2020/07/10 10:04:54 hauke Exp $
+
+OpenSSL mandates that you need to re-create dependencies for
+unorthodox combinations of build options. These days, the compiler
+will create dependency information. On older platforms (e.g. pre-v9
+Darwin) Configure will fall back to makedepend(8), which hasn't kept up
+well with compilers' options.
+
+Instead of failing the build on makedepend(8) malfunction, have
+make(1) ignore its return value - which used to be the default for
+previous OpenSSL versions.
+
+--- Configure.orig     2020-04-21 12:22:39.000000000 +0000
++++ Configure
+@@ -1419,7 +1419,7 @@ if (!$disabled{makedepend}) {
+     } else {
+         # In all other cases, we look for 'makedepend', and disable the
+         # capability if not found.
+-        $config{makedepprog} = which('makedepend');
++        $config{makedepprog} = '-' . which('makedepend');
+         disable('unavailable', 'makedepend') unless $config{makedepprog};
+     }
+ }