<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cec81316e91c85c7e8cfe3e9396f296d18d00d1a">https://github.com/macports/macports-ports/commit/cec81316e91c85c7e8cfe3e9396f296d18d00d1a</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 cec8131 root6: fix mysql variant, removing self conflict, update to use gcc9 for fortran Closes:https://trac.macports.org/ticket/58614
</span>cec8131 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cec81316e91c85c7e8cfe3e9396f296d18d00d1a
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Jun 17 11:08:44 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: fix mysql variant, removing self conflict, update to use gcc9 for fortran
</span><span style='display:block; white-space:pre;color:#404040;'> Closes:https://trac.macports.org/ticket/58614
</span>---
science/root6/Portfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/Portfile b/science/root6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 257cda8..5afcf8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ platforms darwin
</span> dist_subdir root/${version}_1
# Force a compatible compiler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set gcc_ver 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gcc_ver 9
</span> configure.fc ${prefix}/bin/gfortran-mp-${gcc_ver}
configure.f77 ${prefix}/bin/gfortran-mp-${gcc_ver}
configure.f90 ${prefix}/bin/gfortran-mp-${gcc_ver}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -524,14 +524,14 @@ variant sqlite3 description {Build with sqlite3 support} {
</span> depends_lib-append port:sqlite3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql conflicts mysql mariadb percona description {Build with mysql56 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql conflicts mariadb percona description {Build with mysql 5.7 support} {
</span> set ver 57
configure.args-replace -Dmysql=OFF -Dmysql=ON
configure.args-append -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mysql${ver}/bin/mysql_config"
depends_lib-append port:mysql${ver}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mariadb conflicts mysql percona description {Build with mariadb support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mariadb conflicts mysql percona description {Build with mariadb 10.2 support} {
</span> set ver 10.2
configure.args-replace -Dmysql=OFF -Dmysql=ON
configure.args-append -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mariadb-${ver}/bin/mysql_config"
</pre><pre style='margin:0'>
</pre>