/[gentoo-x86]/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Mon Jan 11 01:25:07 2010 UTC (4 years, 6 months ago) by abcd
Branch: MAIN
CVS Tags: HEAD
Add prefix keywords, patches
(Portage version: -svn/cvs/Linux i686)

1 Patch by Heiko Przybyl
2
3 --- Source/cmComputeLinkInformation.cxx
4 +++ Source/cmComputeLinkInformation.cxx
5 @@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge
6 for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin();
7 ri != runtimeDirs.end(); ++ri)
8 {
9 + // Do not add duplicates.
10 + // I'd like to have that check already in the list generation code
11 + // but that would need lots of more changes, even in ExpandListArgument().
12 + if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos)
13 + {
14 + //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl;
15 + continue;
16 + }
17 // Separate from previous path.
18 rpath += sep;
19 sep = this->GetRuntimeSep().c_str();

  ViewVC Help
Powered by ViewVC 1.1.20