<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/cbbc31e677f741bb522f255e1b70cec1b4716afd">https://github.com/macports/macports-base/commit/cbbc31e677f741bb522f255e1b70cec1b4716afd</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 cbbc31e Check cxx_stdlib, delete_la_files for archive sites
</span>cbbc31e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cbbc31e677f741bb522f255e1b70cec1b4716afd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Apr 9 07:39:24 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> Check cxx_stdlib, delete_la_files for archive sites
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/56053
</span>---
doc/archive_sites.conf | 13 +++++++++++++
src/macports1.0/macports.tcl | 10 ++++++++--
src/package1.0/portarchivefetch.tcl | 9 +++++++--
3 files changed, 28 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/archive_sites.conf b/doc/archive_sites.conf
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ff699c..36c6b52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/archive_sites.conf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/archive_sites.conf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,19 @@
</span> # installation used to create the source's archives. This must
# match the value of "frameworks_dir" set in macports.conf, or the
# source is not used. Defaults to "[prefix]/Library/Frameworks".
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cxx_stdlib: The C++ standard library used by the MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# installation used to create the source's archives. This must
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# match the value of "cxx_stdlib" set in macports.conf, or the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# source is not used. Defaults to "libc++" on OS X 10.9 or later,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and "libstdc++" on 10.8 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# delete_la_files: Whether the MacPorts installation used to create
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the source's archives was configured to delete the .la files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# installed by GNU libtool. This must match the value of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "delete_la_files" set in macports.conf, or the source is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# used. Defaults to "yes" on OS X 10.9 or later, and "no" on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.8 and earlier.
</span>
# Example source:
#name My Source
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f363f7..52f554f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5253,9 +5253,15 @@ proc macports::get_archive_sites_conf_values {} {
</span> if {![info exists archive_sites_conf_values]} {
set archive_sites_conf_values {}
set all_names {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set defaults {applications_dir /Applications/MacPorts prefix /opt/local type tbz2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set defaults_list {applications_dir /Applications/MacPorts prefix /opt/local type tbz2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$macports::os_platform eq "darwin" && $macports::os_major <= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend defaults_list cxx_stdlib libstdc++ delete_la_files no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend defaults_list cxx_stdlib libc++ delete_la_files yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set defaults $defaults_list
</span> set conf_file ${macports_conf_path}/archive_sites.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set conf_options {applications_dir frameworks_dir name prefix type urls}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf_options {applications_dir cxx_stdlib delete_la_files frameworks_dir name prefix type urls}
</span> if {[file isfile $conf_file]} {
set fd [open $conf_file r]
while {[gets $fd line] >= 0} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portarchivefetch.tcl b/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e9f0918..6c48818 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portarchivefetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,10 +65,13 @@ default archive.subdir {${subport}}
</span>
proc portarchivefetch::filter_sites {} {
global prefix frameworks_dir applications_dir porturl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ cxx_stdlib delete_la_files \
</span> portfetch::mirror_sites::sites portfetch::mirror_sites::archive_type \
portfetch::mirror_sites::archive_prefix \
portfetch::mirror_sites::archive_frameworks_dir \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- portfetch::mirror_sites::archive_applications_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portfetch::mirror_sites::archive_applications_dir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portfetch::mirror_sites::archive_cxx_stdlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portfetch::mirror_sites::archive_delete_la_files
</span>
# get defaults from ports tree resources
set mirrorfile [get_full_archive_sites_path]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +86,7 @@ proc portarchivefetch::filter_sites {} {
</span> set ret {}
foreach site [array names portfetch::mirror_sites::archive_prefix] {
set missing 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach var {archive_frameworks_dir archive_applications_dir archive_type} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach var {archive_frameworks_dir archive_applications_dir archive_type archive_cxx_stdlib archive_delete_la_files} {
</span> if {![info exists portfetch::mirror_sites::${var}($site)]} {
ui_warn "no $var configured for site '$site'"
set missing 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,6 +99,8 @@ proc portarchivefetch::filter_sites {} {
</span> $portfetch::mirror_sites::archive_prefix($site) eq $prefix &&
$portfetch::mirror_sites::archive_frameworks_dir($site) eq $frameworks_dir &&
$portfetch::mirror_sites::archive_applications_dir($site) eq $applications_dir &&
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ $portfetch::mirror_sites::archive_cxx_stdlib($site) eq $cxx_stdlib &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $portfetch::mirror_sites::archive_delete_la_files($site) eq $delete_la_files &&
</span> ![catch {archiveTypeIsSupported $portfetch::mirror_sites::archive_type($site)}]} {
# using the archive type as a tag
lappend ret ${site}::$portfetch::mirror_sites::archive_type($site)
</pre><pre style='margin:0'>
</pre>