Imported Debian patch 2.8.12.1-1.4

ci/unstable
Anibal Monsalve Salazar 11 years ago committed by Felix Geyer
parent 5f578c6c76
commit 68a9b85cc3

11
debian/changelog vendored

@ -1,3 +1,14 @@
cmake (2.8.12.1-1.4) unstable; urgency=medium
* Non-maintainer upload.
* Add support for mips64 mips64el mipsn32 mipsn32el in
Modules/FindJNI.cmake.
Add FindJNI.cmake.mips.patch.
Patch by Yunqiang Su.
Closes: #747174.
-- Anibal Monsalve Salazar <anibal@debian.org> Mon, 26 May 2014 12:34:45 +0100
cmake (2.8.12.1-1.3) unstable; urgency=medium cmake (2.8.12.1-1.3) unstable; urgency=medium
* Non-maintainer upload. * Non-maintainer upload.

@ -0,0 +1,20 @@
From: Yunqiang Su <wzssyqa@gmail.com>
Subject: cmake - FindJNI add mips64(el) mipsn32(el) support
Date: Tue, 6 May 2014 16:06:45 +0800
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747174
Add support for mips64 mips64el mipsn32 mipsn32el in
Modules/FindJNI.cmake.
--- a/Modules/FindJNI.cmake 2014-05-23 09:26:39.000000000 +0100
+++ b/Modules/FindJNI.cmake 2014-05-26 12:19:53.275844095 +0100
@@ -44,7 +44,7 @@ macro(java_append_library_directories _v
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
# mips* machines are bi-endian mostly so processor does not tell
# endianess of the underlying system.
- set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
+ set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
set(_java_libarch "ppc64" "ppc")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")

@ -7,3 +7,4 @@ FindJNI_amd64_ppc_biarch.diff
fix-ftbfs-on-kfreebsd.patch fix-ftbfs-on-kfreebsd.patch
fix-FindFreetype.diff fix-FindFreetype.diff
FindRuby_support_Ruby_2.diff FindRuby_support_Ruby_2.diff
FindJNI.cmake.mips.patch

Loading…
Cancel
Save