<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3d7fa2491d83feeaeebdf99e7d69885d91a43a76">https://github.com/macports/macports-ports/commit/3d7fa2491d83feeaeebdf99e7d69885d91a43a76</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3d7fa24 qt5x: avoid build-time conflict with openssl
</span>3d7fa24 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3d7fa2491d83feeaeebdf99e7d69885d91a43a76
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 9 07:32:34 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5x: avoid build-time conflict with openssl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> -I${prefix}/include/openssl-1.0 becomes
</span><span style='display:block; white-space:pre;color:#404040;'> -isystem${prefix}/include/openssl-1.0 during the build.
</span><span style='display:block; white-space:pre;color:#404040;'> CPATH is checked before -isystem.
</span><span style='display:block; white-space:pre;color:#404040;'> Since ${prefix}/include is in CPATH, openssl headers are found
</span><span style='display:block; white-space:pre;color:#404040;'> Instead of openssl10 header files.
</span>---
aqua/qt53/Portfile | 7 +++++--
aqua/qt55/Portfile | 7 +++++--
aqua/qt56/Portfile | 7 +++++--
aqua/qt57/Portfile | 7 +++++--
aqua/qt58/Portfile | 7 +++++--
aqua/qt59/Portfile | 7 +++++--
6 files changed, 30 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c6c40a..7a7c5e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1100,8 +1100,11 @@ foreach {module module_info} [array get modules] {
</span>
# see https://trac.macports.org/ticket/58204
depends_lib-append port:openssl10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Please do not use -I and -L.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I becomes -isystem in the Qt build system, which is checked *after* CPATH.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${prefix}/include/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef75e58..ccf0e0f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1097,8 +1097,11 @@ foreach {module module_info} [array get modules] {
</span>
# see https://trac.macports.org/ticket/58204
depends_lib-append port:openssl10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Please do not use -I and -L.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I becomes -isystem in the Qt build system, which is checked *after* CPATH.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${prefix}/include/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 306ddbd..32c8c30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1144,8 +1144,11 @@ foreach {module module_info} [array get modules] {
</span>
# see https://trac.macports.org/ticket/58204
depends_lib-append port:openssl10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Please do not use -I and -L.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I becomes -isystem in the Qt build system, which is checked *after* CPATH.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${prefix}/include/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d4065c9..776028d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1223,8 +1223,11 @@ foreach {module module_info} [array get modules] {
</span>
# see https://trac.macports.org/ticket/58204
depends_lib-append port:openssl10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Please do not use -I and -L.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I becomes -isystem in the Qt build system, which is checked *after* CPATH.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${prefix}/include/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eabb161..1e3ea5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1213,8 +1213,11 @@ foreach {module module_info} [array get modules] {
</span>
# see https://trac.macports.org/ticket/58204
depends_lib-append port:openssl10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Please do not use -I and -L.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I becomes -isystem in the Qt build system, which is checked *after* CPATH.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${prefix}/include/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8758cbc..6df7389 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1199,8 +1199,11 @@ foreach {module module_info} [array get modules] {
</span>
# see https://trac.macports.org/ticket/58204
depends_lib-append port:openssl10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Please do not use -I and -L.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I becomes -isystem in the Qt build system, which is checked *after* CPATH.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${prefix}/include/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
</pre><pre style='margin:0'>
</pre>