Revision
107491
Author
jmr@macports.org
Date
2013-07-01 08:00:40 -0700 (Mon, 01 Jul 2013)

Log Message

merge r107465 from trunk:
 Make delete_la_files an option for macports.conf

Modified Paths

Property Changed

Diff

Property changes: branches/release_2_2

Added: svn:mergeinfo

Property changes: branches/release_2_2/base

Modified: svn:mergeinfo

/branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /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:106802,106807,106809 /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/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:106802,106807,106809,107465 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692

Modified: branches/release_2_2/base/src/macports1.0/macports.tcl (107490 => 107491)


--- branches/release_2_2/base/src/macports1.0/macports.tcl	2013-07-01 13:30:03 UTC (rev 107490)
+++ branches/release_2_2/base/src/macports1.0/macports.tcl	2013-07-01 15:00:40 UTC (rev 107491)
@@ -50,7 +50,7 @@
         macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \
         master_site_local patch_site_local archive_site_local buildfromsource \
         revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds \
-        host_blacklist preferred_hosts sandbox_enable \
+        host_blacklist preferred_hosts sandbox_enable delete_la_files \
         packagemaker_path default_compilers pkg_post_unarchive_deletions"
     variable user_options ""
     variable portinterp_options "\
@@ -61,7 +61,7 @@
         configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \
         applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \
         os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target \
-        packagemaker_path default_compilers sandbox_enable \
+        packagemaker_path default_compilers sandbox_enable delete_la_files \
         pkg_post_unarchive_deletions $user_options"
 
     # deferred options are only computed when needed.
@@ -578,7 +578,8 @@
         macports::archivefetch_pubkeys \
         macports::ping_cache \
         macports::host_blacklisted \
-        macports::host_preferred
+        macports::host_preferred \
+        macports::delete_la_files
 
     # Set the system encoding to utf-8
     encoding system utf-8
@@ -954,6 +955,9 @@
     if {![info exists macports::revupgrade_mode]} {
         set macports::revupgrade_mode "rebuild"
     }
+    if {![info exists macports::delete_la_files]} {
+        set macports::delete_la_files no
+    }
     if {![info exists macports::global_options(ports_rev-upgrade_id-loadcmd-check)]
          && [info exists macports::revupgrade_check_id_loadcmds]} {
         set macports::global_options(ports_rev-upgrade_id-loadcmd-check) ${macports::revupgrade_check_id_loadcmds}

Modified: branches/release_2_2/base/src/port1.0/portdestroot.tcl (107490 => 107491)


--- branches/release_2_2/base/src/port1.0/portdestroot.tcl	2013-07-01 13:30:03 UTC (rev 107490)
+++ branches/release_2_2/base/src/port1.0/portdestroot.tcl	2013-07-01 15:00:40 UTC (rev 107491)
@@ -69,7 +69,7 @@
 default destroot.clean no
 default destroot.keepdirs ""
 default destroot.violate_mtree no
-default destroot.delete_la_files no
+default destroot.delete_la_files {${delete_la_files}}
 
 default startupitem.name        {${subport}}
 default startupitem.uniquename  {org.macports.${startupitem.name}}