[dev-util/cmake] Version bump 2.8.9.

(Portage version: 2.2.0_alpha120/git/Linux i686, unsigned Manifest commit)

1 files changed, 19 insertions, 0 deletions

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<std::string>::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();