<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/6b85a077ae7b88997cfdb2f8a33f9e36cc1fb5de">https://github.com/macports/macports-ports/commit/6b85a077ae7b88997cfdb2f8a33f9e36cc1fb5de</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6b85a077ae7b88997cfdb2f8a33f9e36cc1fb5de
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Fri Sep 29 03:07:06 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: do not view prefix as a system directory
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump because port either builds correctly or not at all.
</span>---
aqua/qt5/Portfile | 10 ++++++++++
aqua/qt55/Portfile | 10 ++++++++++
aqua/qt56/Portfile | 10 ++++++++++
aqua/qt57/Portfile | 10 ++++++++++
4 files changed, 40 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 69418df..3d87600 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -615,6 +615,16 @@ array set sql_plugins {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# because CPATH is set, pkgconfig does not include ${prefix}/lib and ${prefix}/include even when requested
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this means that files in ${prefix}/lib and ${prefix}/include are the *last* to be found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this causes problems when there are files in ${worksrpath} that are unintentionally found instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {module module_info} [array get modules] {
set revision_string [string trim [lindex ${module_info} 8]]
<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 d83d608..bbb24e2 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;'>@@ -512,6 +512,16 @@ array set sql_plugins {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# because CPATH is set, pkgconfig does not include ${prefix}/lib and ${prefix}/include even when requested
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this means that files in ${prefix}/lib and ${prefix}/include are the *last* to be found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this causes problems when there are files in ${worksrpath} that are unintentionally found instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {module module_info} [array get modules] {
set revision_string [string trim [lindex ${module_info} 8]]
<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 89ebf6c..594b6ae 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;'>@@ -530,6 +530,16 @@ array set sql_plugins {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# because CPATH is set, pkgconfig does not include ${prefix}/lib and ${prefix}/include even when requested
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this means that files in ${prefix}/lib and ${prefix}/include are the *last* to be found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this causes problems when there are files in ${worksrpath} that are unintentionally found instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {module module_info} [array get modules] {
set revision_string [string trim [lindex ${module_info} 8]]
<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 e35958e..1377239 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;'>@@ -602,6 +602,16 @@ array set sql_plugins {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# because CPATH is set, pkgconfig does not include ${prefix}/lib and ${prefix}/include even when requested
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this means that files in ${prefix}/lib and ${prefix}/include are the *last* to be found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this causes problems when there are files in ${worksrpath} that are unintentionally found instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {module module_info} [array get modules] {
set revision_string [string trim [lindex ${module_info} 8]]
</pre><pre style='margin:0'>
</pre>