Date: Sun, 27 Sep 2015 10:44:39 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398034 - head/www/apache22 Message-ID: <201509271044.t8RAid2e026093@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Sep 27 10:44:39 2015 New Revision: 398034 URL: https://svnweb.freebsd.org/changeset/ports/398034 Log: - fix poudriere build on FreeBSD >= 10.x with OpenSSL from ports I haven't found the exact culprit but it seems build in poudriere behaves different. Fix build in poudriere by inspecting MAKE_ENV, else WITH_OPENSSL_PORT is not honored. Noted by: Philip Jocks <pj @ netzkommune.de> Modified: head/www/apache22/Makefile Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Sun Sep 27 10:32:29 2015 (r398033) +++ head/www/apache22/Makefile Sun Sep 27 10:44:39 2015 (r398034) @@ -164,14 +164,13 @@ pre-configure:: @${ECHO_MSG} " You can check your modules configuration by using make show-modules" @${ECHO_MSG} "" +pre-configure-SSL-on:: # Fix build with OpenSSL from ports -.if ${PORT_OPTIONS:MSSL} -. if ${OPSYS} == FreeBSD -. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" +.if ${OPSYS} == FreeBSD +. if (defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "") || ${MAKE_ENV:M*${LOCALBASE}/openssl*} @${ECHO_MSG} "===> apply fix for FreeBSD-${OSREL} (${OSVERSION}) for usage with ${OPENSSL_INSTALLED}" @${ECHO_MSG} "" ${REINPLACE_CMD} -e "s|(ALL_CFLAGS)|(ALL_CFLAGS) -L${OPENSSLLIB}|" ${WRKSRC}/build/rules.mk.in -. endif . endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509271044.t8RAid2e026093>