From d1742db94e44817130ab96eed8343e96068e937d Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Fri, 13 Jan 2012 10:02:13 +0100 Subject: [dev-util/cmake] Revision bump. Adds new FindBoost.cmake patch which fixes bug 335108. (Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit) --- .../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch (limited to 'dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch') diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch new file mode 100644 index 00000000000..ceb205ff586 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch @@ -0,0 +1,19 @@ +Patch by Heiko Przybyl + +--- Source/cmComputeLinkInformation.cxx ++++ Source/cmComputeLinkInformation.cxx +@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge + for(std::vector::const_iterator ri = runtimeDirs.begin(); + ri != runtimeDirs.end(); ++ri) + { ++ // Do not add duplicates. ++ // I'd like to have that check already in the list generation code ++ // but that would need lots of more changes, even in ExpandListArgument(). ++ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) ++ { ++ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; ++ continue; ++ } + // Separate from previous path. + rpath += sep; + sep = this->GetRuntimeSep().c_str(); -- cgit v1.2.3