Changeset 97868

Timestamp:

Sep 18, 2012, 11:59:57 AM (12 years ago)

Author:

raimue@…

Message:

port1.0/portconfigure.tcl:
ccache failed with ccache >= 3.1.7, since the initialization did not use
correct permissions. This only creates the directory as root, and then runs the
initialization as macportsuser.

File:

• trunk/base/src/port1.0/portconfigure.tcl (modified) (1 diff)

trunk/base/src/port1.0/portconfigure.tcl

@@ -231 +231 @@
     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
+            }
+        }
     }
 }