[152667] branches/release_2_3/base
raimue at macports.org
raimue at macports.org
Wed Sep 14 07:09:21 PDT 2016
Revision: 152667
https://trac.macports.org/changeset/152667
Author: raimue at macports.org
Date: 2016-09-14 07:09:20 -0700 (Wed, 14 Sep 2016)
Log Message:
-----------
merge r119571 from trunk:
process relative symlinks that point to .la files according to delete_la_files setting (absolute ones are trickier)
merge r119594 from trunk:
handle absolute links to .la files (#40935)
merge r119595 from trunk:
read the link contents (oops)
Revision Links:
--------------
https://trac.macports.org/changeset/119571
https://trac.macports.org/changeset/119594
https://trac.macports.org/changeset/119595
Modified Paths:
--------------
branches/release_2_3/base/src/port1.0/portdestroot.tcl
Property Changed:
----------------
branches/release_2_3/base/
branches/release_2_3/base/src/
Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,134501-134502,134511,136965,137850,138461,138530,138749,139270,140693,140724,141134,141412,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,134501-134502,134511,136965,137850,138461,138530,138749,139270,140693,140724,141134,141412,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Property changes on: branches/release_2_3/base/src
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base/src:37343-46937
/branches/gsoc09-logging/base/src:51231-60371
/branches/gsoc11-rev-upgrade/base/src:78828-88375
/branches/gsoc11-statistics/base/src:79520,79666
/branches/gsoc13-tests/src:106692-111324
/branches/universal-sanity/base/src:51872-52323
/branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,141412,145037,145162,146644,147347,147456,148084,149299,150305,152115,152442,152447
/users/perry/base-bugs_and_notes/src:45682-46060
/users/perry/base-select/src:44044-44692
+ /branches/gsoc08-privileges/base/src:37343-46937
/branches/gsoc09-logging/base/src:51231-60371
/branches/gsoc11-rev-upgrade/base/src:78828-88375
/branches/gsoc11-statistics/base/src:79520,79666
/branches/gsoc13-tests/src:106692-111324
/branches/universal-sanity/base/src:51872-52323
/branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,141412,145037,145162,146644,147347,147456,148084,149299,150305,152115,152442,152447
/users/perry/base-bugs_and_notes/src:45682-46060
/users/perry/base-select/src:44044-44692
Modified: branches/release_2_3/base/src/port1.0/portdestroot.tcl
===================================================================
--- branches/release_2_3/base/src/port1.0/portdestroot.tcl 2016-09-14 14:07:16 UTC (rev 152666)
+++ branches/release_2_3/base/src/port1.0/portdestroot.tcl 2016-09-14 14:09:20 UTC (rev 152667)
@@ -172,24 +172,33 @@
# Prevent overlinking due to glibtool .la files: https://trac.macports.org/ticket/38010
ui_debug "Fixing glibtool .la files in destroot for ${subport}"
fs-traverse -depth fullpath ${destroot} {
- if {[file extension $fullpath] eq ".la" && [file type $fullpath] eq "file"} {
+ if {[file extension $fullpath] eq ".la" && ([file type $fullpath] eq "file" || [file type $fullpath] eq "link")} {
+ if {[file type $fullpath] eq "link" && [file pathtype [file link $fullpath]] ne "relative"} {
+ # prepend $destroot to target of absolute symlinks
+ set checkpath ${destroot}[file link $fullpath]
+ } else {
+ set checkpath $fullpath
+ }
# Make sure it is from glibtool ... "a libtool library file" will appear in the first line
- if {![catch {set fp [open $fullpath]}]} {
+ if {![catch {set fp [open $checkpath]}]} {
if {[gets $fp line] > 0 && [string first "a libtool library file" $line] != -1} {
- if {${destroot.delete_la_files}} {
- ui_debug "Removing [file tail $fullpath]"
- file delete -force ${fullpath}
- } else {
- ui_debug "Clearing dependency_libs in [file tail $fullpath]"
- reinplace "/dependency_libs/ s/'.*'/''/" ${fullpath}
- }
+ lappend la_file_list $fullpath
}
} else {
- ui_debug "Failed to open $fullpath"
+ ui_debug "Failed to open $checkpath"
}
catch {close $fp}
}
}
+ foreach fullpath $la_file_list {
+ if {${destroot.delete_la_files}} {
+ ui_debug "Removing [file tail $fullpath]"
+ file delete -force ${fullpath}
+ } else {
+ ui_debug "Clearing dependency_libs in [file tail $fullpath]"
+ reinplace "/dependency_libs/ s/'.*'/''/" ${fullpath}
+ }
+ }
# Prune empty directories in ${destroot}
foreach path ${destroot.keepdirs} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160914/28ea2cc3/attachment-0001.html>
More information about the macports-changes
mailing list