[120636] trunk/dports/lang

4 Jun 2014

Revision: 120636
          https://trac.macports.org/changeset/120636
Author:   jeremyhu@macports.org
Date:     2014-06-03 21:22:34 -0700 (Tue, 03 Jun 2014)
Log Message:
-----------
llvm-3.{3,4,5}: Support a 10.10 deployment target

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.3/Portfile
    trunk/dports/lang/llvm-3.4/Portfile
    trunk/dports/lang/llvm-3.5/Portfile

Added Paths:
-----------
    trunk/dports/lang/llvm-3.3/files/yosemite-deployment-target.patch
    trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch
    trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch

Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================

--- trunk/dports/lang/llvm-3.3/Portfile	2014-06-04 02:56:57 UTC (rev 120635)
+++ trunk/dports/lang/llvm-3.3/Portfile	2014-06-04 04:22:34 UTC (rev 120636)
@@ -6,7 +6,7 @@
 set llvm_version        3.3
 revision                4
 name                    llvm-${llvm_version}
-subport                 clang-${llvm_version} {}
+subport                 clang-${llvm_version} { revision 5 }
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
 dist_subdir             llvm
@@ -97,6 +97,7 @@
                          0001-Comment-out-SL-cctools-workaround.patch \
                          mavericks-libc++.patch \
                          snowleopard-cmath.patch \
+                         yosemite-deployment-target.patch \
                          export_dynamic.patch
 
     build.target        clang-only

Added: trunk/dports/lang/llvm-3.3/files/yosemite-deployment-target.patch
===================================================================
--- trunk/dports/lang/llvm-3.3/files/yosemite-deployment-target.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.3/files/yosemite-deployment-target.patch	2014-06-04 04:22:34 UTC (rev 120636)
@@ -0,0 +1,32 @@
+--- a/tools/clang/lib/Basic/Targets.cpp
++++ b/tools/clang/lib/Basic/Targets.cpp
+@@ -156,12 +156,22 @@ static void getDarwinDefines(MacroBuilde
+     // version.
+     assert(Triple.getEnvironmentName().empty() && "Invalid environment!");
+     assert(Maj < 100 && Min < 100 && Rev < 100 && "Invalid version!");
+-    char Str[5];
+-    Str[0] = '0' + (Maj / 10);
+-    Str[1] = '0' + (Maj % 10);
+-    Str[2] = '0' + std::min(Min, 9U);
+-    Str[3] = '0' + std::min(Rev, 9U);
+-    Str[4] = '\0';
++    char Str[7];
++    if (Maj < 10 || Maj == 10 && Min < 10) {
++      Str[0] = '0' + (Maj / 10);
++      Str[1] = '0' + (Maj % 10);
++      Str[2] = '0' + std::min(Min, 9U);
++      Str[3] = '0' + std::min(Rev, 9U);
++      Str[4] = '\0';
++    } else {
++      Str[0] = '0' + (Maj / 10);
++      Str[1] = '0' + (Maj % 10);
++      Str[2] = '0' + (Min / 10);
++      Str[3] = '0' + (Min % 10);
++      Str[4] = '0' + (Rev / 10);
++      Str[5] = '0' + (Rev % 10);
++      Str[6] = '\0';
++    }
+     Builder.defineMacro("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__", Str);
+   }
+ 
+

Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile	2014-06-04 02:56:57 UTC (rev 120635)
+++ trunk/dports/lang/llvm-3.4/Portfile	2014-06-04 04:22:34 UTC (rev 120636)
@@ -7,7 +7,7 @@
 set llvm_version_no_dot 34
 revision                3
 name                    llvm-${llvm_version}
-subport                 clang-${llvm_version} {}
+subport                 clang-${llvm_version} { revision 4 }
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
 dist_subdir             llvm
@@ -110,6 +110,7 @@
                          0001-Comment-out-SL-cctools-workaround.patch \
                          clang-format.patch \
                          clang-modernize.patch \
+                         yosemite-deployment-target.patch \
                          snowleopard-cmath.patch
 
     build.target        clang-only

Added: trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch	2014-06-04 04:22:34 UTC (rev 120636)
@@ -0,0 +1,31 @@
+--- a/tools/clang/lib/Basic/Targets.cpp
++++ b/tools/clang/lib/Basic/Targets.cpp
+@@ -161,12 +161,22 @@ static void getDarwinDefines(MacroBuilde
+       // version.
+       assert(Triple.getEnvironmentName().empty() && "Invalid environment!");
+       assert(Maj < 100 && Min < 100 && Rev < 100 && "Invalid version!");
+-      char Str[5];
+-      Str[0] = '0' + (Maj / 10);
+-      Str[1] = '0' + (Maj % 10);
+-      Str[2] = '0' + std::min(Min, 9U);
+-      Str[3] = '0' + std::min(Rev, 9U);
+-      Str[4] = '\0';
++      char Str[7];
++      if (Maj < 10 || Maj == 10 && Min < 10) {
++        Str[0] = '0' + (Maj / 10);
++        Str[1] = '0' + (Maj % 10);
++        Str[2] = '0' + std::min(Min, 9U);
++        Str[3] = '0' + std::min(Rev, 9U);
++        Str[4] = '\0';
++      } else {
++        Str[0] = '0' + (Maj / 10);
++        Str[1] = '0' + (Maj % 10);
++        Str[2] = '0' + (Min / 10);
++        Str[3] = '0' + (Min % 10);
++        Str[4] = '0' + (Rev / 10);
++        Str[5] = '0' + (Rev % 10);
++        Str[6] = '\0';
++      }
+       Builder.defineMacro("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__", Str);
+     }
+   }

Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile	2014-06-04 02:56:57 UTC (rev 120635)
+++ trunk/dports/lang/llvm-3.5/Portfile	2014-06-04 04:22:34 UTC (rev 120636)
@@ -8,7 +8,7 @@
 set llvm_version_no_dot 35
 revision                2
 name                    llvm-${llvm_version}
-subport                 clang-${llvm_version} {}
+subport                 clang-${llvm_version} { revision 3 }
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
 dist_subdir             llvm
@@ -91,6 +91,7 @@
                          0001-Comment-out-SL-cctools-workaround.patch \
                          clang-format.patch \
                          clang-modernize.patch \
+                         yosemite-deployment-target.patch \
                          snowleopard-cmath.patch
 
     build.target        clang-only

Added: trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch	2014-06-04 04:22:34 UTC (rev 120636)
@@ -0,0 +1,31 @@
+--- a/tools/clang/lib/Basic/Targets.cpp
++++ b/tools/clang/lib/Basic/Targets.cpp
+@@ -155,12 +155,22 @@ static void getDarwinDefines(MacroBuilde
+     // revision numbers). So, we limit them to the maximum representable
+     // version.
+     assert(Maj < 100 && Min < 100 && Rev < 100 && "Invalid version!");
+-    char Str[5];
+-    Str[0] = '0' + (Maj / 10);
+-    Str[1] = '0' + (Maj % 10);
+-    Str[2] = '0' + std::min(Min, 9U);
+-    Str[3] = '0' + std::min(Rev, 9U);
+-    Str[4] = '\0';
++    char Str[7];
++    if (Maj < 10 || Maj == 10 && Min < 10) {
++      Str[0] = '0' + (Maj / 10);
++      Str[1] = '0' + (Maj % 10);
++      Str[2] = '0' + std::min(Min, 9U);
++      Str[3] = '0' + std::min(Rev, 9U);
++      Str[4] = '\0';
++    } else {
++      Str[0] = '0' + (Maj / 10);
++      Str[1] = '0' + (Maj % 10);
++      Str[2] = '0' + (Min / 10);
++      Str[3] = '0' + (Min % 10);
++      Str[4] = '0' + (Rev / 10);
++      Str[5] = '0' + (Rev % 10);
++      Str[6] = '\0';
++    }
+     Builder.defineMacro("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__", Str);
+   }
+

    

jeremyhu＠macports.org

tags

participants (1)