Make sure CMake considers /lib/<arch> as implicit.

Therefore CMake keeps it out of automatic R(UN)PATH then (patch
multiarch_lib_dirs_should_be_implicit.diff).

debian/changelog

@@ -4,6 +4,8 @@ cmake (2.8.5-1) UNRELEASED; urgency=low
     - fixes UseSWIG. (Closes: #631497)
   * Drop screen-256color-bce.diff - merged upstream.
   * Drop spelling_formatting_fixes.diff - merged upstream.
+  * Make sure CMake considers /lib/<arch> as implicit and keeps it out of
+    automatic R(UN)PATH (patch multiarch_lib_dirs_should_be_implicit.diff).
 
  -- Modestas Vainius <modax@debian.org>  Sat, 09 Jul 2011 00:47:19 +0300
 

debian/patches/multiarch_lib_dirs_should_be_implicit.diff

@@ -0,0 +1,32 @@
+From: Modestas Vainius <modax@debian.org>
+Subject: Multiarch directories should be among implicit link directories as well
+Forwarded: yes
+Origin: vendor
+Last-Update: 2011-07-09
+
+Add multiarch library directories to the set of implicit link directories. In
+particular, this keeps /lib/<arch> out of R(UN)PATH of the binaries cmake
+builds.
+
+--- a/Source/cmComputeLinkInformation.cxx
++++ b/Source/cmComputeLinkInformation.cxx
+@@ -1603,6 +1603,19 @@ void cmComputeLinkInformation::LoadImpli
+     cmSystemTools::ExpandListArgument(implicitLinks, implicitDirVec);
+     }
+ 
++  // Append library architecture to all implicit platform directories
++  // and add them to the set
++  if(const char* libraryArch =
++     (this->Makefile->GetDefinition
++      ("CMAKE_LIBRARY_ARCHITECTURE")))
++    {
++    for (std::vector<std::string>::const_iterator i = implicitDirVec.begin();
++         i != implicitDirVec.end(); ++i)
++      {
++      this->ImplicitLinkDirs.insert(*i + "/" + libraryArch);
++      }
++    }
++
+   // Get language-specific implicit directories.
+   std::string implicitDirVar = "CMAKE_";
+   implicitDirVar += this->LinkLanguage;

debian/patches/series

@@ -1,2 +1,3 @@
 FindBoost_add_-lpthread_#563479.diff
 multiarch_findgtk2_fix.diff
+multiarch_lib_dirs_should_be_implicit.diff