[Pkg-cmake-commits] [cmake] 01/02: Add support for x32 in FindJNI. (Closes: #792262)

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch experimental
in repository cmake.

commit 0e757b0ee093ded0f519d217a817cb4fcfbe1969
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Aug 27 19:23:16 2015 +0200

    Add support for x32 in FindJNI. (Closes: #792262)
    
    * Add support for x32 in FindJNI. (Closes: #792262)
      - FindJNI-Add-support-for-x32-architecture-on-Linux.patch
---
 debian/changelog                                   |  2 ++
 ...Add-support-for-x32-architecture-on-Linux.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e6f50d0..be0a890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ cmake (3.3.1-2) UNRELEASED; urgency=medium
   * Add a stage1 build profile that disables building cmake-qt-gui.
     (Bug: #738161)
   * Add autopkgtests which run the upstream testsuite against the system cmake.
+  * Add support for x32 in FindJNI. (Closes: #792262)
+    - FindJNI-Add-support-for-x32-architecture-on-Linux.patch
 
  -- Felix Geyer <fgeyer at debian.org>  Sat, 22 Aug 2015 19:09:55 +0200
 
diff --git a/debian/patches/FindJNI-Add-support-for-x32-architecture-on-Linux.patch b/debian/patches/FindJNI-Add-support-for-x32-architecture-on-Linux.patch
new file mode 100644
index 0000000..b08e3d3
--- /dev/null
+++ b/debian/patches/FindJNI-Add-support-for-x32-architecture-on-Linux.patch
@@ -0,0 +1,30 @@
+From c4d78b8bc05d44b8a46b5d2db6b52b42a101ef2d Mon Sep 17 00:00:00 2001
+From: Thorsten Glaser <tg at mirbsd.de>
+Date: Mon, 24 Aug 2015 10:53:00 -0400
+Subject: [PATCH] FindJNI: Add support for x32 architecture on Linux (#15710)
+
+This architecture uses an amd64 kernel but x32 userland.
+Use CMAKE_LIBRARY_ARCHITECTURE to distinguish it for now.
+---
+ Modules/FindJNI.cmake | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
+index d248fe1..d31fea3 100644
+--- a/Modules/FindJNI.cmake
++++ b/Modules/FindJNI.cmake
+@@ -42,7 +42,11 @@ macro(java_append_library_directories _var)
+     # 1.6.0_18 + icedtea patches. However, it would be much better to base the
+     # guess on the first part of the GNU config.guess platform triplet.
+     if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
++      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
++        set(_java_libarch "x32" "amd64" "i386")
++      else()
+         set(_java_libarch "amd64" "i386")
++      endif()
+     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
+         set(_java_libarch "i386")
+     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
+-- 
+2.5.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 14733af..198f0e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ qt_import_dir_variable.diff
 fix-ftbfs-on-kfreebsd.patch
 FindJNI.cmake.mips.patch
 fix-hdf5-hl.patch
+FindJNI-Add-support-for-x32-architecture-on-Linux.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git