[p4est] 01/02: Do not export architecture dependent stuff in config.h

[Matthias Maier]

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

tamiko-guest pushed a commit to branch master
in repository p4est.

commit 1fad2aa9aa585ec5cbba0333a73559b9800de199
Author: Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>
Date:   Sat Jul 16 09:48:15 2016 +0000

    Do not export architecture dependent stuff in config.h
---
 debian/patches/do_not_declare_library_dirty.patch  | 26 ++++++++++++
 .../do_not_export_arch_dependent_config_h.patch    | 49 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 77 insertions(+)

diff --git a/debian/patches/do_not_declare_library_dirty.patch b/debian/patches/do_not_declare_library_dirty.patch
new file mode 100644
index 0000000..f5d155b
--- /dev/null
+++ b/debian/patches/do_not_declare_library_dirty.patch
@@ -0,0 +1,26 @@
+diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
+index b6c9d41..7d0f9d7 100755
+--- a/build-aux/git-version-gen
++++ b/build-aux/git-version-gen
+@@ -141,7 +141,7 @@ v=`echo "$v" |sed 's/^v//'`
+ # Don't declare a version "dirty" merely because a time stamp has changed.
+ git status > /dev/null 2>&1
+ 
+-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
++dirty=
+ case "$dirty" in
+   '') ;;
+   *) # Append the suffix only if there isn't one already.
+diff --git a/sc/build-aux/git-version-gen b/sc/build-aux/git-version-gen
+index b6c9d41..7d0f9d7 100755
+--- a/sc/build-aux/git-version-gen
++++ b/sc/build-aux/git-version-gen
+@@ -141,7 +141,7 @@ v=`echo "$v" |sed 's/^v//'`
+ # Don't declare a version "dirty" merely because a time stamp has changed.
+ git status > /dev/null 2>&1
+ 
+-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
++dirty=
+ case "$dirty" in
+   '') ;;
+   *) # Append the suffix only if there isn't one already.
diff --git a/debian/patches/do_not_export_arch_dependent_config_h.patch b/debian/patches/do_not_export_arch_dependent_config_h.patch
new file mode 100644
index 0000000..86a34ec
--- /dev/null
+++ b/debian/patches/do_not_export_arch_dependent_config_h.patch
@@ -0,0 +1,49 @@
+diff --git a/example/p6est/p6est_vtk.c b/example/p6est/p6est_vtk.c
+index 86d0f1b..dd2df85 100644
+--- a/example/p6est/p6est_vtk.c
++++ b/example/p6est/p6est_vtk.c
+@@ -23,6 +23,7 @@
+ 
+ #include <p6est_vtk.h>
+ #include <sc_io.h>
++#include <endian.h>
+ 
+ #define P4EST_VTK_CELL_TYPE     11      /* VTK_VOXEL */
+ 
+@@ -205,7 +206,7 @@ p6est_vtk_write_header (p6est_t * p6est,
+ #if defined P4EST_VTK_BINARY && defined P4EST_VTK_COMPRESSION
+   fprintf (vtufile, " compressor=\"vtkZLibDataCompressor\"");
+ #endif
+-#ifdef SC_IS_BIGENDIAN
++#if __BYTE_ORDER == __BIG_ENDIAN
+   fprintf (vtufile, " byte_order=\"BigEndian\">\n");
+ #else
+   fprintf (vtufile, " byte_order=\"LittleEndian\">\n");
+@@ -515,7 +516,7 @@ p6est_vtk_write_header (p6est_t * p6est,
+ #if defined P4EST_VTK_BINARY && defined P4EST_VTK_COMPRESSION
+     fprintf (pvtufile, " compressor=\"vtkZLibDataCompressor\"");
+ #endif
+-#ifdef SC_IS_BIGENDIAN
++#if __BYTE_ORDER == __BIG_ENDIAN
+     fprintf (pvtufile, " byte_order=\"BigEndian\">\n");
+ #else
+     fprintf (pvtufile, " byte_order=\"LittleEndian\">\n");
+diff --git a/sc/configure.ac b/sc/configure.ac
+index 11c4f52..69b4673 100644
+--- a/sc/configure.ac
++++ b/sc/configure.ac
+@@ -73,14 +73,9 @@ echo "o---------------------------------------"
+ echo "| Checking keywords and types"
+ echo "o---------------------------------------"
+ 
+-AC_C_BIGENDIAN([AC_DEFINE([IS_BIGENDIAN], 1, [Define to 1 on a bigendian machine])])
+ AC_C_CONST
+ AC_C_INLINE
+ AC_C_RESTRICT
+-AC_CHECK_SIZEOF([long])
+-AC_CHECK_SIZEOF([long long])
+-AC_CHECK_SIZEOF([unsigned long])
+-AC_CHECK_SIZEOF([unsigned long long])
+ AC_TYPE_SIZE_T
+ AC_TYPE_SSIZE_T
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6bb7f88
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+do_not_declare_library_dirty.patch
+do_not_export_arch_dependent_config_h.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/p4est.git