Revision: 99323 http://trac.macports.org//changeset/99323 Author: jeremyhu@macports.org Date: 2012-11-01 01:54:28 -0700 (Thu, 01 Nov 2012) Log Message: ----------- llvm-3.2: Bump to r167157 to support ppc flop Revision Links: -------------- http://trac.macports.org//changeset/167157 Modified Paths: -------------- trunk/dports/lang/llvm-3.2/Portfile Removed Paths: ------------- trunk/dports/lang/llvm-3.2/files/0001-Use-I-dir-and-L-dir-when-constructing-our-argument-l.patch Modified: trunk/dports/lang/llvm-3.2/Portfile =================================================================== --- trunk/dports/lang/llvm-3.2/Portfile 2012-11-01 06:07:11 UTC (rev 99322) +++ trunk/dports/lang/llvm-3.2/Portfile 2012-11-01 08:54:28 UTC (rev 99323) @@ -48,7 +48,7 @@ } fetch.type svn -svn.revision 166880 +svn.revision 167157 set compiler_rt_rev ${svn.revision} set libcxx_rev ${svn.revision} @@ -81,7 +81,6 @@ } patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \ - 0001-Use-I-dir-and-L-dir-when-constructing-our-argument-l.patch \ 0001-Comment-out-SL-cctools-workaround.patch build.target clang-only Deleted: trunk/dports/lang/llvm-3.2/files/0001-Use-I-dir-and-L-dir-when-constructing-our-argument-l.patch =================================================================== --- trunk/dports/lang/llvm-3.2/files/0001-Use-I-dir-and-L-dir-when-constructing-our-argument-l.patch 2012-11-01 06:07:11 UTC (rev 99322) +++ trunk/dports/lang/llvm-3.2/files/0001-Use-I-dir-and-L-dir-when-constructing-our-argument-l.patch 2012-11-01 08:54:28 UTC (rev 99323) @@ -1,85 +0,0 @@ -From d5ee45f9157e649c88ee0bfa89796db687159198 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Tue, 25 Sep 2012 12:22:13 -0700 -Subject: [PATCH] Use -I<dir> and -L<dir> when constructing our argument list. - --L <dir> is not valid with XCode older than 4.0. - -<rdar://problem/12366753> -https://trac.macports.org/ticket/36042 - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - lib/Driver/Tools.cpp | 39 +++++++++++++++++++++++++++++++-------- - 1 file changed, 31 insertions(+), 8 deletions(-) - -diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp -index 8619b98..9f5cfc2 100644 ---- a/tools/clang/lib/Driver/Tools.cpp -+++ b/tools/clang/lib/Driver/Tools.cpp -@@ -93,9 +93,16 @@ static void addDirectoryList(const ArgList &Args, - const char *ArgName, - const char *EnvVar) { - const char *DirList = ::getenv(EnvVar); -+ bool CombinedArg = false; -+ - if (!DirList) - return; // Nothing to do. - -+ if (::strcmp("-I", ArgName) == 0 || -+ ::strcmp("-L", ArgName) == 0) { -+ CombinedArg = true; -+ } -+ - StringRef Dirs(DirList); - if (Dirs.empty()) // Empty string should not add '.'. - return; -@@ -103,21 +110,37 @@ static void addDirectoryList(const ArgList &Args, - StringRef::size_type Delim; - while ((Delim = Dirs.find(llvm::sys::PathSeparator)) != StringRef::npos) { - if (Delim == 0) { // Leading colon. -- CmdArgs.push_back(ArgName); -- CmdArgs.push_back("."); -+ if (CombinedArg) { -+ CmdArgs.push_back(Args.MakeArgString(std::string(ArgName) + ".")); -+ } else { -+ CmdArgs.push_back(ArgName); -+ CmdArgs.push_back("."); -+ } - } else { -- CmdArgs.push_back(ArgName); -- CmdArgs.push_back(Args.MakeArgString(Dirs.substr(0, Delim))); -+ if (CombinedArg) { -+ CmdArgs.push_back(Args.MakeArgString(std::string(ArgName) + Dirs.substr(0, Delim))); -+ } else { -+ CmdArgs.push_back(ArgName); -+ CmdArgs.push_back(Args.MakeArgString(Dirs.substr(0, Delim))); -+ } - } - Dirs = Dirs.substr(Delim + 1); - } - - if (Dirs.empty()) { // Trailing colon. -- CmdArgs.push_back(ArgName); -- CmdArgs.push_back("."); -+ if (CombinedArg) { -+ CmdArgs.push_back(Args.MakeArgString(std::string(ArgName) + ".")); -+ } else { -+ CmdArgs.push_back(ArgName); -+ CmdArgs.push_back("."); -+ } - } else { // Add the last path. -- CmdArgs.push_back(ArgName); -- CmdArgs.push_back(Args.MakeArgString(Dirs)); -+ if (CombinedArg) { -+ CmdArgs.push_back(Args.MakeArgString(std::string(ArgName) + Dirs)); -+ } else { -+ CmdArgs.push_back(ArgName); -+ CmdArgs.push_back(Args.MakeArgString(Dirs)); -+ } - } - } - --- -1.7.12.1 -