Drop patches that have been applied upstream.
* Drop patches that have been applied upstream: - FindJNI.cmake.mips.patch - fix-hdf5-hl.patch - FindJNI-Add-support-for-x32-architecture-on-Linux.patch - Features_Extract_strings_from_test_binary_more_reliably.patch - FindPkgConfig_remove_variable_dereference.patch - FindPython_Add_versions_3.5_and_3.6.patch
This commit is contained in:
Felix Geyer
parent
334223b492
commit
399f5fbd0e
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,6 +1,13 @@
|
||||
cmake (3.4.0-1) UNRELEASED; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* Drop patches that have been applied upstream:
|
||||
- FindJNI.cmake.mips.patch
|
||||
- fix-hdf5-hl.patch
|
||||
- FindJNI-Add-support-for-x32-architecture-on-Linux.patch
|
||||
- Features_Extract_strings_from_test_binary_more_reliably.patch
|
||||
- FindPkgConfig_remove_variable_dereference.patch
|
||||
- FindPython_Add_versions_3.5_and_3.6.patch
|
||||
* Point watch file to the https URL.
|
||||
|
||||
-- Felix Geyer <fgeyer@debian.org> Tue, 17 Nov 2015 17:29:12 +0100
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 150e1b27c54cf4e19e19ad7836e6bbfb9fbb5266 Mon Sep 17 00:00:00 2001
|
||||
From: Brad King <brad.king@kitware.com>
|
||||
Date: Thu, 10 Sep 2015 14:37:20 -0400
|
||||
Subject: [PATCH] Features: Extract strings from test binary more reliably
|
||||
(#15736)
|
||||
|
||||
Since commit v3.1.0-rc1~635^2~7 (project: Add infrastructure for
|
||||
recording CXX compiler features, 2013-10-17) we compile a test source to
|
||||
a binary and then extract "<LANG>_FEATURES:..." strings from the binary
|
||||
with the file(STRINGS) command. Add a newline at the beginning of the
|
||||
string literal to be sure file(STRINGS) can extract the first entry as a
|
||||
string independent of whatever else the compiler may put before the
|
||||
storage it allocates for the literal within the binary.
|
||||
---
|
||||
Modules/Internal/FeatureTesting.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
|
||||
index abd9a26..86b89b2 100644
|
||||
--- a/Modules/Internal/FeatureTesting.cmake
|
||||
+++ b/Modules/Internal/FeatureTesting.cmake
|
||||
@@ -5,7 +5,7 @@ macro(record_compiler_features lang compile_flags feature_list)
|
||||
string(TOLOWER ${lang} lang_lc)
|
||||
file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.bin")
|
||||
file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}" "
|
||||
- const char features[] = {\"\"\n")
|
||||
+ const char features[] = {\"\\n\"\n")
|
||||
|
||||
get_property(known_features GLOBAL PROPERTY CMAKE_${lang}_KNOWN_FEATURES)
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
@ -1,30 +0,0 @@
|
||||
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
|
||||
|
||||
22
debian/patches/FindJNI.cmake.mips.patch
vendored
22
debian/patches/FindJNI.cmake.mips.patch
vendored
@ -1,22 +0,0 @@
|
||||
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.
|
||||
|
||||
Index: cmake/Modules/FindJNI.cmake
|
||||
===================================================================
|
||||
--- cmake.orig/Modules/FindJNI.cmake
|
||||
+++ cmake/Modules/FindJNI.cmake
|
||||
@@ -53,7 +53,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)64le")
|
||||
set(_java_libarch "ppc64" "ppc64le")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
|
||||
@ -1,39 +0,0 @@
|
||||
From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
|
||||
From: Rolf Eike Beer <eike@sf-mail.de>
|
||||
Date: Tue, 18 Aug 2015 12:14:43 +0200
|
||||
Subject: [PATCH] FindPkgConfig: remove variable dereference
|
||||
|
||||
If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
|
||||
cmake_minimum_required() call is present this line can lead to an error as that
|
||||
string is empty so too few arguments are passed to if():
|
||||
|
||||
See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
|
||||
See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
|
||||
CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
|
||||
given arguments:
|
||||
|
||||
"VERSION_LESS" "3.1"
|
||||
|
||||
Unknown arguments specified
|
||||
Call Stack (most recent call first):
|
||||
/usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
|
||||
/usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
|
||||
---
|
||||
Modules/FindPkgConfig.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
|
||||
index 526a62e..ae6903e 100644
|
||||
--- a/Modules/FindPkgConfig.cmake
|
||||
+++ b/Modules/FindPkgConfig.cmake
|
||||
@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
|
||||
set(${_no_cmake_path} 1)
|
||||
set(${_no_cmake_environment_path} 1)
|
||||
endif()
|
||||
- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
|
||||
+ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
|
||||
set(${_no_cmake_path} 1)
|
||||
set(${_no_cmake_environment_path} 1)
|
||||
endif()
|
||||
--
|
||||
1.7.10.4
|
||||
@ -1,36 +0,0 @@
|
||||
From 2db092b1f60b3677a2d44d5563bec216ae687e2f Mon Sep 17 00:00:00 2001
|
||||
From: David Gobbi <david.gobbi@gmail.com>
|
||||
Date: Mon, 14 Sep 2015 21:44:36 -0600
|
||||
Subject: [PATCH] FindPython{Interp,Libs}: Add versions 3.5 and 3.6
|
||||
|
||||
---
|
||||
Modules/FindPythonInterp.cmake | 2 +-
|
||||
Modules/FindPythonLibs.cmake | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
|
||||
index 8784e18..879192e 100644
|
||||
--- a/Modules/FindPythonInterp.cmake
|
||||
+++ b/Modules/FindPythonInterp.cmake
|
||||
@@ -51,7 +51,7 @@ unset(_Python_NAMES)
|
||||
|
||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
||||
-set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
|
||||
+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
|
||||
if(PythonInterp_FIND_VERSION)
|
||||
if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
|
||||
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
|
||||
index b80d3ce..d01fae4 100644
|
||||
--- a/Modules/FindPythonLibs.cmake
|
||||
+++ b/Modules/FindPythonLibs.cmake
|
||||
@@ -64,7 +64,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
|
||||
|
||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
||||
-set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
|
||||
+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
|
||||
if(PythonLibs_FIND_VERSION)
|
||||
if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
|
||||
17
debian/patches/fix-hdf5-hl.patch
vendored
17
debian/patches/fix-hdf5-hl.patch
vendored
@ -1,17 +0,0 @@
|
||||
Description: Define HDF5_{Fortran_,}HL_COMPILE_LINE
|
||||
so that HDF5_{Fortran_,}HL_INCLUDE_DIR and HDF5_{Fortran_,}HL_LIBRARIES
|
||||
are found when the macro is invoked for HL and Fortran_HL components.
|
||||
Author: Gilles Filippini <pini@debian.org>
|
||||
Index: cmake/Modules/FindHDF5.cmake
|
||||
===================================================================
|
||||
--- cmake.orig/Modules/FindHDF5.cmake
|
||||
+++ cmake/Modules/FindHDF5.cmake
|
||||
@@ -223,6 +223,8 @@ if( NOT HDF5_FOUND )
|
||||
_HDF5_invoke_compiler( C HDF5_C_COMPILE_LINE HDF5_C_RETURN_VALUE )
|
||||
_HDF5_invoke_compiler( CXX HDF5_CXX_COMPILE_LINE HDF5_CXX_RETURN_VALUE )
|
||||
_HDF5_invoke_compiler( Fortran HDF5_Fortran_COMPILE_LINE HDF5_Fortran_RETURN_VALUE )
|
||||
+ set(HDF5_HL_COMPILE_LINE ${HDF5_C_COMPILE_LINE})
|
||||
+ set(HDF5_Fortran_HL_COMPILE_LINE ${HDF5_Fortran_COMPILE_LINE})
|
||||
|
||||
# seed the initial lists of libraries to find with items we know we need
|
||||
set( HDF5_C_LIBRARY_NAMES_INIT hdf5 )
|
||||
6
debian/patches/series
vendored
6
debian/patches/series
vendored
@ -1,9 +1,3 @@
|
||||
FindBoost_add_-lpthread_#563479.diff
|
||||
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
|
||||
Features_Extract_strings_from_test_binary_more_reliably.patch
|
||||
FindPkgConfig_remove_variable_dereference.patch
|
||||
FindPython_Add_versions_3.5_and_3.6.patch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user