Mon Jan 25 20:26:43 2021 UTC ()
Fix build on OpenBSD by defining __STDC_NO_ATOMICS__.


(schmonz)
diff -r1.266 -r1.267 pkgsrc/security/openssl/Makefile
cvs diff -r1.266 -r1.267 pkgsrc/security/openssl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/openssl/Makefile 2020/12/08 18:54:17 1.266
+++ pkgsrc/security/openssl/Makefile 2021/01/25 20:26:43 1.267
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.266 2020/12/08 18:54:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.267 2021/01/25 20:26:43 schmonz Exp $
2 2
3DISTNAME= openssl-1.1.1i 3DISTNAME= openssl-1.1.1i
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= https://www.openssl.org/source/ 5MASTER_SITES= https://www.openssl.org/source/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.openssl.org/ 8HOMEPAGE= https://www.openssl.org/
9COMMENT= Secure Socket Layer and cryptographic library 9COMMENT= Secure Socket Layer and cryptographic library
10LICENSE= openssl 10LICENSE= openssl
11 11
12USE_GCC_RUNTIME= yes 12USE_GCC_RUNTIME= yes
13 13
14USE_TOOLS+= fgrep gmake makedepend perl 14USE_TOOLS+= fgrep gmake makedepend perl
@@ -30,27 +30,28 @@ CONFIGURE_ARGS+= no-async @@ -30,27 +30,28 @@ CONFIGURE_ARGS+= no-async
30.endif 30.endif
31 31
32.include "options.mk" 32.include "options.mk"
33 33
34CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} 34CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS}
35CONFIGURE_ENV+= PERL=${PERL5:Q} 35CONFIGURE_ENV+= PERL=${PERL5:Q}
36 36
37# If the config script cannot guess the host system correctly then we need to 37# If the config script cannot guess the host system correctly then we need to
38# specify it manually and call the Configure script directly. 38# specify it manually and call the Configure script directly.
39OPENSSL_HOST.SunOS-i386= solaris-x86-gcc 39OPENSSL_HOST.SunOS-i386= solaris-x86-gcc
40OPENSSL_HOST.SunOS-x86_64= solaris64-x86_64-gcc 40OPENSSL_HOST.SunOS-x86_64= solaris64-x86_64-gcc
41OPENSSL_HOST.Darwin-aarch64= darwin64-arm64-cc 41OPENSSL_HOST.Darwin-aarch64= darwin64-arm64-cc
42 42
43LDFLAGS.SunOS+= -lrt 43LDFLAGS.SunOS+= -lrt
 44CPPFLAGS.OpenBSD+= -D__STDC_NO_ATOMICS__
44 45
45.if defined(OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH}) 46.if defined(OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH})
46CONFIG_SHELL= ${PERL5} 47CONFIG_SHELL= ${PERL5}
47CONFIGURE_SCRIPT= ./Configure 48CONFIGURE_SCRIPT= ./Configure
48CONFIGURE_ARGS+= ${OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH}} 49CONFIGURE_ARGS+= ${OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH}}
49.endif 50.endif
50 51
51PKGCONFIG_OVERRIDE+= libcrypto.pc libssl.pc openssl.pc 52PKGCONFIG_OVERRIDE+= libcrypto.pc libssl.pc openssl.pc
52PKGCONFIG_OVERRIDE_STAGE= post-build 53PKGCONFIG_OVERRIDE_STAGE= post-build
53 54
54PKG_SYSCONFSUBDIR= openssl 55PKG_SYSCONFSUBDIR= openssl
55CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \ 56CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \
56 ${PKG_SYSCONFDIR}/openssl.cnf 57 ${PKG_SYSCONFDIR}/openssl.cnf