Changeset 97871

Timestamp:

Sep 18, 2012, 12:05:45 PM (12 years ago)

Author:

raimue@…

Message:

Merge r97868 and r97869 from trunk: ccache intialization fixes

Location:

branches/release_2_1/base

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff, 1 prop)
• src/port1.0/portconfigure.tcl (modified) (1 diff)

branches/release_2_1/base/ChangeLog

@@ -9 +9 @@
       it should start from the beginning.
       (#29223, cal in r96136, r96399, r96400, r96538)
+
+    - Fix permission problem in the creation of the ccache directory with
+      ccache >= 3.1.7 by running the initialization step as the macportsuser.
+      (raimue in r97868)
 
 Release 2.1.2 (2012-07-26 by jmr):

branches/release_2_1/base/src/port1.0/portconfigure.tcl

@@ -230 +230 @@
     global configureccache ccache_dir ccache_size macportsuser
     if {${configureccache}} {
+        # Create ccache directory with correct permissions with root privileges
         elevateToRoot "configure ccache"
         if [catch {
                 file mkdir ${ccache_dir}
                 file attributes ${ccache_dir} -owner ${macportsuser} -permissions 0755
+            } result] {
+            ui_warn "ccache_dir ${ccache_dir} could not be created; disabling ccache: $result"
+            set configureccache no
+        }
+        dropPrivileges
+
+        # Initialize ccache directory with the given maximum size
+        if {${configureccache}} {
+            if [catch {
                 exec ccache -M ${ccache_size} >/dev/null
             } result] {
-            ui_warn "ccache_dir ${ccache_dir} could not be initialized; disabling ccache: $result"
-            set configureccache no
-        }
-        dropPrivileges
+                ui_warn "ccache_dir ${ccache_dir} could not be initialized; disabling ccache: $result"
+                set configureccache no
+            }
+        }
     }
 }