svn commit: r398034 - head/www/apache22

[Mathieu Arnold]

+--On 27 septembre 2015 14:23:01 -0400 "Philip M. Gollucci"
<pgollucci at p6m7g8.com> wrote:
| I don't know about this.  You basically added a if exists file trigger
| option.

You may have missed the pre-configure-SSL-on: line.

| On Sun, Sep 27, 2015 at 6:44 AM, Olli Hauer <ohauer at freebsd.org> wrote:
| 
|> 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
|> 
|> _______________________________________________
|> svn-ports-all at freebsd.org mailing list
|> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
|> To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"



-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 949 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20150927/e6636cc8/attachment.bin>