[107465] trunk/base/src

[jeremyhu at macports.org]

Revision: 107465
          https://trac.macports.org/changeset/107465
Author:   jeremyhu at macports.org
Date:     2013-06-29 23:26:21 -0700 (Sat, 29 Jun 2013)
Log Message:
-----------
Make delete_la_files an option for macports.conf

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portdestroot.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2013-06-30 03:11:55 UTC (rev 107464)
+++ trunk/base/src/macports1.0/macports.tcl	2013-06-30 06:26:21 UTC (rev 107465)
@@ -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.
@@ -580,7 +580,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
@@ -956,6 +957,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: trunk/base/src/port1.0/portdestroot.tcl
===================================================================
--- trunk/base/src/port1.0/portdestroot.tcl	2013-06-30 03:11:55 UTC (rev 107464)
+++ trunk/base/src/port1.0/portdestroot.tcl	2013-06-30 06:26:21 UTC (rev 107465)
@@ -70,7 +70,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.autostart   no
 default startupitem.executable  ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130629/5cfc04a8/attachment.html>