From 46f54f9bc9b08336af15a4e03f0b27ea32bfa6ab Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Sat, 11 Jun 2011 22:20:20 +0300 Subject: [PATCH] Fix multiarch regex to support arm* ... and (hopefully) all other possible linux architectures. Quadtriplet support is included even if it is rare. Patch multiarch_basic_support.diff updated. --- debian/changelog | 2 ++ debian/patches/multiarch_basic_support.diff | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b6932f713..344bde48c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ cmake (2.8.4+dfsg.1-5) UNRELEASED; urgency=low + * Fix multiarch regex to support armel and (hopefully) all other possible + linux architectures (patch multiarch_basic_support.diff updated). -- Modestas Vainius Sat, 11 Jun 2011 22:15:57 +0300 diff --git a/debian/patches/multiarch_basic_support.diff b/debian/patches/multiarch_basic_support.diff index 29b44561e..0fbc5bbd4 100644 --- a/debian/patches/multiarch_basic_support.diff +++ b/debian/patches/multiarch_basic_support.diff @@ -109,7 +109,7 @@ search /lib/ whenever they would search /lib. ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) +# Match multiarch library directory names. -+SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+-linux-gnu") ++SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*") + INCLUDE(Platform/UnixPaths)