From e923c0e1e341bef2b6abb261688eca9777dd965d Mon Sep 17 00:00:00 2001 From: jschauma Date: Mon, 25 Aug 2003 16:34:00 +0000 Subject: Several of the Makefile used in this package call 'make' directly. If an operating system does not have a 'make' (ie only bmake), or if the OS supplied 'make' is sufficiently broken (Irix), this will cause the build to fail (interestingly enough apparently only if build as a dependency, not if build from this directory). Patch Makefiles to use @MAKE@, which then, after patching, is substituted with the actual ${MAKE} (can't use "MAKE= ${MAKE} -f Makefile.ssl"). While here, tweak Irix configure a bit. --- security/openssl/Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'security/openssl/Makefile') diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 837bc52e2db..a8ce3d6cc71 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2003/07/17 22:53:02 grant Exp $ +# $NetBSD: Makefile,v 1.76 2003/08/25 16:34:00 jschauma Exp $ DISTNAME= openssl-0.9.6g PKGREVISION= 2 @@ -35,6 +35,17 @@ CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \ ${PKG_SYSCONFDIR}/openssl.cnf OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private +SEDFILES= Configure Makefile.org Makefile.ssl \ + apps/Makefile.ssl crypto/Makefile.ssl \ + ssl/Makefile.ssl test/Makefile.ssl + +post-patch: + for i in ${SEDFILES}; do \ + ${SED} -e "s/@MAKE@/${MAKE}/" ${WRKSRC}/$$i > \ + ${WRKSRC}/$$i.tmp && \ + ${MV} ${WRKSRC}/$$i.tmp ${WRKSRC}/$$i; \ + done; + do-configure: cd ${WRKSRC} \ && ${PERL5} util/perlpath.pl ${PERL5} \ @@ -79,9 +90,12 @@ CONFIGURE_ARGS+= solaris-${SPARC_TARGET_ARCH}-gcc . else CONFIGURE_ARGS+= solaris-${SPARC_TARGET_ARCH}-cc . endif -.elif ${OPSYS} == "IRIX" && ${ABI} == "64" +.elif ${OPSYS} == "IRIX" +CONFIGURE_ARGS+= no-asm +. if ${ABI} == "64" CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS+= irix64-mips4-cc +. endif .endif .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3