Revision: 124898 https://trac.macports.org/changeset/124898 Author: jeremyhu@macports.org Date: 2014-08-30 10:57:17 -0700 (Sat, 30 Aug 2014) Log Message: ----------- {clang,llvm}-3.{5,6}: Bump to r216817 Revision Links: -------------- https://trac.macports.org/changeset/216817 Modified Paths: -------------- trunk/dports/lang/llvm-3.5/Portfile trunk/dports/lang/llvm-3.6/Portfile Removed Paths: ------------- trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch trunk/dports/lang/llvm-3.6/files/yosemite-deployment-target.patch Modified: trunk/dports/lang/llvm-3.5/Portfile =================================================================== --- trunk/dports/lang/llvm-3.5/Portfile 2014-08-30 14:03:27 UTC (rev 124897) +++ trunk/dports/lang/llvm-3.5/Portfile 2014-08-30 17:57:17 UTC (rev 124898) @@ -52,7 +52,7 @@ } fetch.type svn -svn.revision 214285 +svn.revision 216817 set compiler_rt_rev ${svn.revision} set libcxx_rev ${svn.revision} @@ -90,7 +90,6 @@ 0001-Comment-out-SL-cctools-workaround.patch \ clang-format.patch \ clang-modernize.patch \ - yosemite-deployment-target.patch \ snowleopard-cmath.patch build.target clang-only @@ -305,7 +304,10 @@ if {${subport} == "llvm-${llvm_version}"} { variant polly description {Provide the polly polyhedral optimizer} { - depends_lib-append port:isl-devel port:gmp port:cloog-devel + depends_lib-append \ + port:gmp \ + path:lib/pkgconfig/isl.pc:isl \ + path:lib/pkgconfig/cloog-isl.pc:cloog } variant ocaml description {Enable generation of OCaml binding} { Deleted: trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch =================================================================== --- trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch 2014-08-30 14:03:27 UTC (rev 124897) +++ trunk/dports/lang/llvm-3.5/files/yosemite-deployment-target.patch 2014-08-30 17:57:17 UTC (rev 124898) @@ -1,31 +0,0 @@ ---- 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); - } - Modified: trunk/dports/lang/llvm-3.6/Portfile =================================================================== --- trunk/dports/lang/llvm-3.6/Portfile 2014-08-30 14:03:27 UTC (rev 124897) +++ trunk/dports/lang/llvm-3.6/Portfile 2014-08-30 17:57:17 UTC (rev 124898) @@ -52,7 +52,7 @@ } fetch.type svn -svn.revision 214285 +svn.revision 216817 set compiler_rt_rev ${svn.revision} set libcxx_rev ${svn.revision} @@ -90,7 +90,6 @@ 0001-Comment-out-SL-cctools-workaround.patch \ clang-format.patch \ clang-modernize.patch \ - yosemite-deployment-target.patch \ snowleopard-cmath.patch build.target clang-only @@ -305,7 +304,10 @@ if {${subport} == "llvm-${llvm_version}"} { variant polly description {Provide the polly polyhedral optimizer} { - depends_lib-append port:isl-devel port:gmp port:cloog-devel + depends_lib-append \ + port:gmp \ + path:lib/pkgconfig/isl.pc:isl \ + path:lib/pkgconfig/cloog-isl.pc:cloog } variant ocaml description {Enable generation of OCaml binding} { Deleted: trunk/dports/lang/llvm-3.6/files/yosemite-deployment-target.patch =================================================================== --- trunk/dports/lang/llvm-3.6/files/yosemite-deployment-target.patch 2014-08-30 14:03:27 UTC (rev 124897) +++ trunk/dports/lang/llvm-3.6/files/yosemite-deployment-target.patch 2014-08-30 17:57:17 UTC (rev 124898) @@ -1,31 +0,0 @@ ---- 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); - } -