Date: Sun, 27 Sep 2015 20:48:15 +0200 From: Mathieu Arnold <mat@FreeBSD.org> To: "Philip M. Gollucci" <pgollucci@p6m7g8.com>, Olli Hauer <ohauer@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r398034 - head/www/apache22 Message-ID: <DA2134A9F47EC539F21474CE@atuin.in.mat.cc> In-Reply-To: <CACM2dAbRg9%2BmfU9HGSsB%2BhpoZ1VGMKrX8dw9-HA=L4LhyxnEjA@mail.gmail.com> References: <201509271044.t8RAid2e026093@repo.freebsd.org> <CACM2dAbRg9%2BmfU9HGSsB%2BhpoZ1VGMKrX8dw9-HA=L4LhyxnEjA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--==========D35FB34B6AB900EFBBC6========== Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline +--On 27 septembre 2015 14:23:01 -0400 "Philip M. Gollucci" <pgollucci@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@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@freebsd.org mailing list |> https://lists.freebsd.org/mailman/listinfo/svn-ports-all |> To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" -- Mathieu Arnold --==========D35FB34B6AB900EFBBC6========== Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQJ8BAEBCgBmBQJWCDnvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IcogP/1ACi7YIiqdHjZKUtquYFtDP DieB1FWBMuOrX5htLnrQdkYhDgHtx6Nd0fAXsJNWNfaSF6UqVxpT3m0O7MVpIr42 XixLq7M77jhosbR2eqbLKINRflI+Y4rsGtkNBS0Ub+uMQQpSFBrJVlkmgtAn7TDM Kf3ESzZDdPXTJ2cWy36rX+W6SYV04ZcX98Qe6tRYYU71YdBbUJMt4nmF4LZw7brM mTEjzNpKxuZr3lZfjM6H+ouH+0EgFdW6EAR21epmFRuYEy4Us+QFigNnb17tCZVG LlhsCdmz9dL6fHgUQ8w17A3un33H3dnvEUdWLBU9sVmRkWDlXXgKfI54A/mjHacH lLxY+k1X8kArC9YwA7KfgYthkzHQPJhRkfIQHKCNbwmAv0qVtMDoY00hHDl6fgk4 KZuIqXsNcxv4yrB/fl348DHdxmDBgumbXTTfgInHZ3YU1o9IvYk04Nnhj+uofI89 quJcR8mqN3Ilt+1/cES2928uaeJFWrNPje/kvx0zLXoYroFKo1CcMyjxXaZR8lj0 0jiDZfabTVvhmvg6L9LG7qdhkGSdEA5C6tppu/rHpaWWKBZ8dXde72DFw9BUSFIZ b3BhHdW8u6ksv//afjdzqN/qHVHWuq9E0ivAQvMjAjg5OS8uYoqVGgnIH6KLui/x cd+CThaTU6QJQT+RBGMh =MfAh -----END PGP SIGNATURE----- --==========D35FB34B6AB900EFBBC6==========--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?DA2134A9F47EC539F21474CE>