[117622] trunk/base/src/macports1.0

Joshua Root jmr at macports.org
Sat Mar 8 01:40:02 PST 2014


On 2014-3-8 19:30 , Ryan Schmidt wrote:
> The commit message did not mention the change to macports.tcl that you also made:
> 
>> Modified: trunk/base/src/macports1.0/macports.tcl (117621 => 117622)
>>
>> --- trunk/base/src/macports1.0/macports.tcl	2014-03-05 22:19:14 UTC (rev 117621)
>> +++ trunk/base/src/macports1.0/macports.tcl	2014-03-05 22:21:12 UTC (rev 117622)
>>
>> @@ -4508,15 +4508,6 @@
>>
>>                          continue;
>>
>>                      }
>>
>>  
>>
>> -                    if {(${filepath} == "/usr/lib/libstdc++.6.dylib" && ${macports::cxx_stdlib} == "libc++") ||
>> -                        (${filepath} == "/usr/lib/libc++.1.dylib" && ${macports::cxx_stdlib} == "libstdc++")} {
>> -
>> -                        if {$fancy_output} {
>> -                            $revupgrade_progress intermission
>> -                        }
>> -                        ui_warn "${bpath} uses ${filepath} as C++ standard library although macports::cxx_stdlib is set to ${macports::cxx_stdlib}."
>> -                    }
>> -
>>
>>                      set libresultlist [machista::parse_file $handle $filepath]
>>
>>                      set libreturncode [lindex $libresultlist 0]
>>
>>                      set libresult     [lindex $libresultlist 1]
> 
> Is this change intentional or at least ok, or should it be reverted?

Looks like it probably snuck in to this commit accidentally, but it's OK
to stay. As discussed on the list recently, that check doesn't allow for
ports deliberately using a different stdlib (which is fine in some
cases) and rev-upgrade isn't really the right place to be checking it
anyway.

- Josh


More information about the macports-dev mailing list