[SCM] extra-cmake-modules packaging branch, master, updated. bedfd8095f6d7c46c2ca424c097ee1e11f140123

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/extra-cmake-modules.git;a=commitdiff;h=bedfd80

The following commit has been merged in the master branch:
commit bedfd8095f6d7c46c2ca424c097ee1e11f140123
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 19 16:53:25 2014 +0200

    use a multiarch libdir on kFreeBSD and Hurd
    
    backport upstream commit d5582bb3b1d3132dab8f8486729f62c8b8530da3
---
 debian/changelog                                   |  4 +++
 debian/patches/series                              |  1 +
 ...heck-the-libdir-also-on-kFreeBSD-and-Hurd.patch | 36 ++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ea662be..7536d9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 extra-cmake-modules (1.0.0-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit d5582bb3b1d3132dab8f8486729f62c8b8530da3 to use
+    a multiarch library directory on kFreeBSD and Hurd too; patch
+    upstream_Check-the-libdir-also-on-kFreeBSD-and-Hurd.patch.
 
  -- Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Jul 2014 16:49:46 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 453972e..2314719 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 kde-install-dirs.diff
+upstream_Check-the-libdir-also-on-kFreeBSD-and-Hurd.patch
diff --git a/debian/patches/upstream_Check-the-libdir-also-on-kFreeBSD-and-Hurd.patch b/debian/patches/upstream_Check-the-libdir-also-on-kFreeBSD-and-Hurd.patch
new file mode 100644
index 0000000..c02928b
--- /dev/null
+++ b/debian/patches/upstream_Check-the-libdir-also-on-kFreeBSD-and-Hurd.patch
@@ -0,0 +1,36 @@
+From d5582bb3b1d3132dab8f8486729f62c8b8530da3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 19 Jul 2014 16:45:19 +0200
+Subject: [PATCH] Check the libdir also on kFreeBSD and Hurd
+
+This way, on the Debian versions of these OSes, the library directory
+can be a multiarch path.
+---
+ kde-modules/KDEInstallDirs.cmake | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index 25b308b..880539b 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -173,14 +173,15 @@
+ # by the _define_* macros in this module).
+ set(_LIBDIR_DEFAULT "lib")
+ # Override this default 'lib' with 'lib64' iff:
+-#  - we are on Linux system but NOT cross-compiling
++#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
+ #  - we are NOT on debian
+ #  - we are on a 64 bits system
+ # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+ # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+ # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+ # See http://wiki.debian.org/Multiarch
+-if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CROSSCOMPILING)
++if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
++   AND NOT CMAKE_CROSSCOMPILING)
+   if (EXISTS "/etc/debian_version") # is this a debian system ?
+     if(CMAKE_LIBRARY_ARCHITECTURE)
+       set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-- 
+2.0.1
+

-- 
extra-cmake-modules packaging