From 68a9b85cc329e3e57e1416b7f5f45aa11e42692b Mon Sep 17 00:00:00 2001 From: Anibal Monsalve Salazar Date: Mon, 26 May 2014 12:34:45 +0100 Subject: [PATCH] Imported Debian patch 2.8.12.1-1.4 --- debian/changelog | 11 +++++++++++ debian/patches/FindJNI.cmake.mips.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+) create mode 100644 debian/patches/FindJNI.cmake.mips.patch diff --git a/debian/changelog b/debian/changelog index 1a3ceb608..198bfa3cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Mon, 26 May 2014 12:34:45 +0100 + cmake (2.8.12.1-1.3) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/patches/FindJNI.cmake.mips.patch b/debian/patches/FindJNI.cmake.mips.patch new file mode 100644 index 000000000..b911d31a5 --- /dev/null +++ b/debian/patches/FindJNI.cmake.mips.patch @@ -0,0 +1,20 @@ +From: Yunqiang Su +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)") diff --git a/debian/patches/series b/debian/patches/series index fe32aa041..e89911c8a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ FindJNI_amd64_ppc_biarch.diff fix-ftbfs-on-kfreebsd.patch fix-FindFreetype.diff FindRuby_support_Ruby_2.diff +FindJNI.cmake.mips.patch