CVS commit: pkgsrc/security/openssl

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jul  9 18:22:56 UTC 2021

Modified Files:
        pkgsrc/security/openssl: Makefile

Log Message:
On Mac OS X Snow Leopard with ABI=64, configure was selecting a 32-bit
build (and then failing in the assembler). Override its choice on
Darwin/x86_64 by specifying KERNEL_BITS=${ABI} in CONFIGURE_ENV.


To generate a diff of this commit:
cvs rdiff -u -r1.271 -r1.272 pkgsrc/security/openssl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssl/Makefile
diff -u pkgsrc/security/openssl/Makefile:1.271 pkgsrc/security/openssl/Makefile:1.272
--- pkgsrc/security/openssl/Makefile:1.271      Mon May 24 19:53:55 2021
+++ pkgsrc/security/openssl/Makefile    Fri Jul  9 18:22:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.271 2021/05/24 19:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.272 2021/07/09 18:22:56 schmonz Exp $
 
 # Remember to upload-distfiles when updating OpenSSL -- otherwise it 
 # is not possible for users who have bootstrapped without OpenSSL
@@ -33,6 +33,11 @@ CONFIGURE_ARGS+=     shared
 CONFIGURE_ARGS+=       no-async
 .endif
 
+# Fix 64-bit build on at least Mac OS X Snow Leopard
+.if ${OPSYS} == "Darwin" && ${MACHINE_ARCH} == "x86_64"
+CONFIGURE_ENV+=                KERNEL_BITS=${ABI}
+.endif
+
 .include "options.mk"
 
 CONFIGURE_ARGS+=       ${CFLAGS} ${LDFLAGS}