diff options
Diffstat (limited to 'dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch')
-rw-r--r-- | dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 |
1 files changed, 0 insertions, 19 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 deleted file mode 100644 index ceb205f..0000000 --- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -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(); |