ohnobinki_overlay Files · dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch

Files @ 5aec9d013452

Branch filter:

Location: ohnobinki_overlay/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch

5aec9d013452 794 B text/x-diff Show Annotation Show as Raw Download as Raw

binki

media-plugins/live: Match live ebuild up more closely with the gentoo-x86-cvs version. Drop live-2009.06.02. Fix building live without live being previously installed (was trying to link against previously-installed live libraries).

(Portage version: 2.2.0_alpha27-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

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();