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
ci/unstable
Felix Geyer 9 years ago
parent 55b1b64fe3
commit 0e757b0ee0

2
debian/changelog vendored

@ -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@debian.org> Sat, 22 Aug 2015 19:09:55 +0200

@ -0,0 +1,30 @@
From c4d78b8bc05d44b8a46b5d2db6b52b42a101ef2d Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@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

@ -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

Loading…
Cancel
Save