<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/63ecdda4c57e470ffc36b6f0b53ff43f6f53953a">https://github.com/macports/macports-ports/commit/63ecdda4c57e470ffc36b6f0b53ff43f6f53953a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 63ecdda4c57e470ffc36b6f0b53ff43f6f53953a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Jul 7 10:47:21 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt56: allow compile.test to accept more link options
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Allow compile.test recognize -Wl, from, e.g., glib2.
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump because port builds successfully or not at all.
</span>---
aqua/qt56/Portfile | 4 ++++
aqua/qt56/files/patch-compile_test.diff | 24 ++++++++++++++++++++++++
2 files changed, 28 insertions(+)
<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 0358db8..c5c3588 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;'>@@ -647,6 +647,10 @@ foreach {module module_info} [array get modules] {
</span> # see http://comments.gmane.org/gmane.comp.lib.qt.user/21422
patchfiles-append patch-fontconfig.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # backport change from Qt 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # recognize -Wl, from, e.g., glib2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-compile_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # the build system uses pkgconfig to look for an OpenGL installation (gl.pc)
# the build system automatically uses OpenGL frameworks (-framework OpenGL -framework AGL)
# if mesa is installed, the build system will try to use both OpenGL systems
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-compile_test.diff b/aqua/qt56/files/patch-compile_test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..de6df4a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-compile_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.tests/unix/compile.test 2016-09-15 22:49:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.tests/unix/compile.test.new 2017-07-07 00:20:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +31,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LFLAGS="$LFLAGS -framework \"$2\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -Wl,-framework,*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LFLAGS="$LFLAGS -framework \"${PARAM#-Wl,-framework,}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -Wl,-framework)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # -Wl,-framework,... cought above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case $2 in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -Wl,*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LFLAGS="$LFLAGS -framework \"${2#-Wl,}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ shift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -arch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAC_ARCH_CFLAGS="$MAC_ARCH_CFLAGS -arch $2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAC_ARCH_CXXFLAGS="$MAC_ARCH_CXXFLAGS -arch $2"
</span></pre><pre style='margin:0'>
</pre>