Revision

91488

Author

jeremyhu@macports.org

Date

2012-04-02 23:59:32 -0700 (Mon, 02 Apr 2012)

Log Message

clang-*: Remove ld during pre-activate to address an earlier bug (#33847)

Modified Paths

• trunk/dports/lang/clang-2.9/Portfile
• trunk/dports/lang/clang-3.0/Portfile
• trunk/dports/lang/clang-3.1/Portfile

Diff

--- trunk/dports/lang/clang-2.9/Portfile	2012-04-03 03:02:59 UTC (rev 91487)
+++ trunk/dports/lang/clang-2.9/Portfile	2012-04-03 06:59:32 UTC (rev 91488)
@@ -201,3 +201,13 @@
     system "install_name_tool -id ${sub_prefix}/lib/libclang.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
     system "install_name_tool -change @executable_path/../lib/libLLVM-${llvm_version}svn.dylib ${sub_prefix}/lib/libLLVM-${llvm_version}svn.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
 }
+
+pre-activate {
+    # An earlier version of this port accidentally installed ${sub_prefix}/bin/ld
+    # rather than ${destroot}${sub_prefix}/bin/ld
+    if {[file exists ${sub_prefix}/bin/ld]} {
+        if {[catch {delete ${sub_prefix}/bin/ld}]} {
+            ui_warn "Cannot delete ${sub_prefix}/bin/ld; please remove it manually."
+        } 
+    }
+}

--- trunk/dports/lang/clang-3.0/Portfile	2012-04-03 03:02:59 UTC (rev 91487)
+++ trunk/dports/lang/clang-3.0/Portfile	2012-04-03 06:59:32 UTC (rev 91488)
@@ -199,3 +199,13 @@
     system "install_name_tool -id ${sub_prefix}/lib/libclang.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
     system "install_name_tool -change @executable_path/../lib/libLLVM-${llvm_version}svn.dylib ${sub_prefix}/lib/libLLVM-${llvm_version}svn.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
 }
+
+pre-activate {
+    # An earlier version of this port accidentally installed ${sub_prefix}/bin/ld
+    # rather than ${destroot}${sub_prefix}/bin/ld
+    if {[file exists ${sub_prefix}/bin/ld]} {
+        if {[catch {delete ${sub_prefix}/bin/ld}]} {
+            ui_warn "Cannot delete ${sub_prefix}/bin/ld; please remove it manually."
+        } 
+    }
+}

--- trunk/dports/lang/clang-3.1/Portfile	2012-04-03 03:02:59 UTC (rev 91487)
+++ trunk/dports/lang/clang-3.1/Portfile	2012-04-03 06:59:32 UTC (rev 91488)
@@ -195,3 +195,13 @@
     system "install_name_tool -id ${sub_prefix}/lib/libclang.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
     system "install_name_tool -change @executable_path/../lib/libLLVM-${llvm_version}svn.dylib ${sub_prefix}/lib/libLLVM-${llvm_version}svn.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
 }
+
+pre-activate {
+    # An earlier version of this port accidentally installed ${sub_prefix}/bin/ld
+    # rather than ${destroot}${sub_prefix}/bin/ld
+    if {[file exists ${sub_prefix}/bin/ld]} {
+        if {[catch {delete ${sub_prefix}/bin/ld}]} {
+            ui_warn "Cannot delete ${sub_prefix}/bin/ld; please remove it manually."
+        } 
+    }
+}