[netcdf] 01/05: Add patch by Helmut Grohne to fix cross building. (closes: #885845)

Bas Couwenberg sebastic at debian.org
Sat Dec 30 11:17:57 UTC 2017


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

sebastic pushed a commit to branch master
in repository netcdf.

commit 6c681928bf4abf6a5d3ea0fcb2f48e2ef7b19321
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 30 11:55:04 2017 +0100

    Add patch by Helmut Grohne to fix cross building. (closes: #885845)
---
 debian/changelog           |  2 ++
 debian/patches/cross.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e810e41..77793a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 netcdf (1:4.5.0-2) UNRELEASED; urgency=medium
 
   * Strip trailing whitespace from changelog.
+  * Add patch by Helmut Grohne to fix cross building.
+    (closes: #885845)
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 15 Nov 2017 22:03:03 +0100
 
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
new file mode 100644
index 0000000..73cabc6
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,34 @@
+Description: Fix cross build from source.
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/885845
+Bug: https://github.com/Unidata/netcdf-c/issues/753
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,6 @@ INCLUDE(${CMAKE_ROOT}/Modules/CheckTypeS
+ INCLUDE(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/CheckCSourceCompiles.cmake)
+-INCLUDE(${CMAKE_ROOT}/Modules/CheckCSourceRuns.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/GetPrerequisites.cmake)
+@@ -1194,14 +1193,12 @@ MARK_AS_ADVANCED(ENABLE_SHARED_LIBRARY_V
+ SET(SIGNED_TEST_SOURCE "\n
+   #include <stdlib.h>\n
+   int main(void) {\n
+-    char is_signed = (char) - 1;\n
+-    if(is_signed < 0)\n
+-      return 1;\n
+-    else\n
+-      return 0;\n
++    char error_if_char_is_signed[((char)-1) < 0 ? -1 : 1];\n
++    error_if_char_is_signed[0] = 0;
++    return 0;\n
+ }\n")
+ 
+-CHECK_C_SOURCE_RUNS("${SIGNED_TEST_SOURCE}" __CHAR_UNSIGNED__)
++CHECK_C_SOURCE_COMPILES("${SIGNED_TEST_SOURCE}" __CHAR_UNSIGNED__)
+ 
+ # Library include checks
+ CHECK_INCLUDE_FILE("math.h"      HAVE_MATH_H)
diff --git a/debian/patches/series b/debian/patches/series
index bf960a3..7c9f290 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ privacy-breach-logo.patch
 hdf5-library-path.patch
 tst_fileinfo-link-hdf5.patch
 reproducible-settings.patch
+cross.patch

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



More information about the Pkg-grass-devel mailing list