<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/62a7c66f02f00302aa4d2d70f17c8e548c89de85">https://github.com/macports/macports-base/commit/62a7c66f02f00302aa4d2d70f17c8e548c89de85</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 62a7c66 Remove support for dragonegg compilers
</span>62a7c66 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62a7c66f02f00302aa4d2d70f17c8e548c89de85
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jun 29 23:36:22 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> Remove support for dragonegg compilers
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The corresponding ports have been obsoleted.
</span>---
src/port1.0/portconfigure.tcl | 29 +----------------------------
src/port1.0/portutil.tcl | 2 --
2 files changed, 1 insertion(+), 30 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 976e63f..8405a7d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,9 +331,6 @@ proc portconfigure::configure_start {args} {
</span> {^llvm-gcc-4\.2$} {Xcode LLVM-GCC 4.2}
{^macports-clang$} {MacPorts Clang (port select)}
{^macports-clang-(\d+\.\d+)$} {MacPorts Clang %s}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-dragonegg-(\d+\.\d+)$} {MacPorts DragonEgg %s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-dragonegg-(\d+\.\d+)-gcc-(\d+\.\d+)$}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {MacPorts DragonEgg %s with GCC %s}
</span> {^macports-gcc$} {MacPorts GCC (port select)}
{^macports-gcc-(\d+(?:\.\d+)?)$} {MacPorts GCC %s}
{^macports-llvm-gcc-4\.2$} {MacPorts LLVM-GCC 4.2}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -569,7 +566,6 @@ proc portconfigure::compiler_port_name {compiler} {
</span> set valid_compiler_ports {
{^apple-gcc-(\d+)\.(\d+)$} {apple-gcc%s%s}
{^macports-clang-(\d+\.\d+)$} {clang-%s}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {^macports-dragonegg-(\d+\.\d+)(-gcc-\d+\.\d+)?$} {dragonegg-%s%s}
</span> {^macports-(llvm-)?gcc-(\d+)(?:\.(\d+))?$} {%sgcc%s%s}
{^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-default$} {%s-default}
{^macports-(mpich|openmpi|mpich-devel|openmpi-devel)-clang$} {%s-clang}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1178,21 +1174,6 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span> objcxx { return ${prefix}/bin/clang++${suffix} }
cpp { return ${prefix}/bin/clang-cpp${suffix} }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[regexp {^macports-dragonegg(-\d+\.\d+)(?:-gcc(-\d+\.\d+))?$} $compiler \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -> infix suffix]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$suffix ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set suffix "-mp${suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch $type {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cc -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- objc { return ${prefix}/bin/dragonegg${infix}-gcc${suffix} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cxx -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- objcxx { return ${prefix}/bin/dragonegg${infix}-g++${suffix} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpp { return ${prefix}/bin/dragonegg${infix}-cpp${suffix} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fc -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f77 -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f90 { return ${prefix}/bin/dragonegg${infix}-gfortran${suffix} }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } elseif {[regexp {^macports-gcc(-\d+(?:\.\d+)?)?$} $compiler -> suffix]} {
if {$suffix ne ""} {
set suffix "-mp${suffix}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1322,15 +1303,7 @@ proc portconfigure::add_compiler_port_dependencies {compiler} {
</span> depends_build-append port:$compiler_port
# add C++ runtime dependency if necessary
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [regexp {^macports-gcc-(\d+(?:\.\d+)?)?$} ${compiler} -> gcc_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [regexp {^macports-dragonegg-(\d+\.\d+)(?:-gcc-(\d+\.\d+))?$} ${compiler} -> llvm_version gcc_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists llvm_version] && ${gcc_version} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # port dragonegg-3.4 defaults to GCC version 4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_version 4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[regexp {^macports-gcc-(\d+(?:\.\d+)?)?$} ${compiler} -> gcc_version]} {
</span> set libgccs ""
set dependencies_file [getportresourcepath $porturl "port1.0/compilers/gcc_dependencies.tcl"]
if {[file exists ${dependencies_file}]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 22aa306..fc31a11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2115,8 +2115,6 @@ proc universal_setup {args} {
</span> [regexp {^macports-gcc-(\d+(?:\.\d+)?)?$} [option configure.compiler] -> gcc_version]
||
[regexp {^macports-(mpich|openmpi)-gcc-(\d+(?:\.\d+)?)?$} [option configure.compiler] -> gcc_version]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [regexp {^macports-dragonegg-(\d+\.\d+)(?:-gcc-(\d+\.\d+))?$} [option configure.compiler] -> llvm_version gcc_version]
</span> } {
ui_debug "Compiler doesn't support universal builds, so not adding the default universal variant"
} else {
</pre><pre style='margin:0'>
</pre>