<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fcf7bddcb3395cb709f793e7970e3420d2418ad0">https://github.com/macports/macports-ports/commit/fcf7bddcb3395cb709f793e7970e3420d2418ad0</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 fcf7bdd postgresql11, postgresql12: fix compiler usage
</span>fcf7bdd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fcf7bddcb3395cb709f793e7970e3420d2418ad0
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Tue Oct 15 21:25:19 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> postgresql11, postgresql12: fix compiler usage
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the compilers portgroup to allow for painless switching between
</span><span style='display:block; white-space:pre;color:#404040;'> compilers and also correctly plumb the right environment variables down
</span><span style='display:block; white-space:pre;color:#404040;'> into ./configure.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58654
</span>---
databases/postgresql11/Portfile | 18 +++++++++++++++---
databases/postgresql12/Portfile | 19 ++++++++++++++++---
2 files changed, 31 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql11/Portfile b/databases/postgresql11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52babc7..a22a56b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compilers 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +68,9 @@ configure.ldflags-append -headerpad_max_install_names
</span> configure.universal_args-delete --disable-dependency-tracking
# building psql with clang from Xcode prior to 4.4 causes segfault on query; see #31717
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 421}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 421}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.choose cc cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.setup -gcc -fortran -clang33 -clang34 -clang37
</span> notes "To use the postgresql server, install the ${name}-server port"
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +149,16 @@ variant tcl description {add Tcl support} {
</span> }
variant llvm description {add support for JIT compilation} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:llvm-6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_ver 9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach clang ${compilers.clang_variants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_exists ${clang}] && [variant_isset ${clang}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_ver [string index ${clang} end-1].[string index ${clang} end]
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:llvm-${llvm_ver}
</span> configure.args-append --with-llvm
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append LLVM_CONFIG=${prefix}/libexec/llvm-6.0/bin/llvm-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append LLVM_CONFIG=${prefix}/libexec/llvm-${llvm_ver}/bin/llvm-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLANG=${configure.cc}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql12/Portfile b/databases/postgresql12/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cafe580..22fc300 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compilers 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +68,9 @@ configure.ldflags-append -headerpad_max_install_names
</span> configure.universal_args-delete --disable-dependency-tracking
# building psql with clang from Xcode prior to 4.4 causes segfault on query; see #31717
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 421}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 421}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.choose cc cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.setup -gcc -fortran -clang33 -clang34 -clang37
</span> notes "To use the postgresql server, install the ${name}-server port"
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +149,17 @@ variant tcl description {add Tcl support} {
</span> }
variant llvm description {add support for JIT compilation} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:llvm-6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_ver 9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach clang ${compilers.clang_variants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_exists ${clang}] && [variant_isset ${clang}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_ver [string index ${clang} end-1].[string index ${clang} end]
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:llvm-${llvm_ver}
</span> configure.args-append --with-llvm
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append LLVM_CONFIG=${prefix}/libexec/llvm-6.0/bin/llvm-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append LLVM_CONFIG=${prefix}/libexec/llvm-${llvm_ver}/bin/llvm-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLANG=${configure.cc}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>