diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
| commit | 1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba (patch) | |
| tree | 475ec53133c361c13c0a1b1793fd1e00c1e0b3ce /dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch | |
| parent | f5837fc796cabbbe572d5b5879eb4ce0aef665b4 (diff) | |
| parent | e1cdc85bc123113b6b9fb4212effda45ef262185 (diff) | |
| download | kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.gz kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.bz2 kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde
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, 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(); |