[SCM] Debian packaging for openturns www.openturns.org branch, debian1.2, updated. debian/1.2_rc1-2

Denis Barbier bouzim at gmail.com
Mon Jul 15 22:13:26 UTC 2013


The following commit has been merged in the debian1.2 branch:
commit 5976f7ea8a4f91b5dcf916c2c71ce3c662a0734e
Author: Denis Barbier <bouzim at gmail.com>
Date:   Mon Jul 15 21:09:40 2013 +0200

    fix-bigendian.patch: Patch rewritten to use CMake detection of endianness
    
    Patch provided by Julien Schueller, thanks.

diff --git a/debian/patches/fix-bigendian.patch b/debian/patches/fix-bigendian.patch
index d07b678..aa12c42 100644
--- a/debian/patches/fix-bigendian.patch
+++ b/debian/patches/fix-bigendian.patch
@@ -3,45 +3,45 @@ Description: Fix build on big endian machines.
  It seems that not all systems define __BIG_ENDIAN__.
  Add some compile-time checks to determine endianness.
 
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
+Author: Julien Schueller
+Origin: Upstream
 Forwarded: no
-Last-Update: 2012-05-22
+Last-Update: 2013-07-15
 
 Index: openturns/CMakeLists.txt
 ===================================================================
 --- openturns.orig/CMakeLists.txt
 +++ openturns/CMakeLists.txt
-@@ -109,6 +109,7 @@ check_include_file ( stdint.h      HAVE_
- check_include_file ( stdlib.h      HAVE_STDLIB_H      )
- check_include_file ( string.h      HAVE_STRING_H      )
- check_include_file ( strings.h     HAVE_STRINGS_H     )
-+check_include_file ( sys/param.h   HAVE_SYS_PARAM_H   )
- check_include_file ( sys/socket.h  HAVE_SYS_SOCKET_H  )
- check_include_file ( sys/stat.h    HAVE_SYS_STAT_H    )
- check_include_file ( sys/time.h    HAVE_SYS_TIME_H    )
+@@ -91,6 +91,9 @@ if ( USE_R )
+   find_package ( R COMPONENTS base rot )
+ endif ()
+ 
++include ( TestBigEndian )
++test_big_endian ( __BIG_ENDIAN__ ) 
++
+ # Find system prerequisites
+ include ( CheckIncludeFile )
+ check_include_file ( arpa/inet.h   HAVE_ARPA_INET_H   )
+Index: openturns/lib/include/OTconfig.h.in
+===================================================================
+--- openturns.orig/lib/include/OTconfig.h.in
++++ openturns/lib/include/OTconfig.h.in
+@@ -223,3 +223,6 @@
+ 
+ /* Define to `unsigned int' if <sys/types.h> does not define. */
+ #cmakedefine size_t
++
++/* Define to 1 if big endian system */
++#cmakedefine __BIG_ENDIAN__
 Index: openturns/lib/src/Base/Stat/dsfmt.h
 ===================================================================
 --- openturns.orig/lib/src/Base/Stat/dsfmt.h
 +++ openturns/lib/src/Base/Stat/dsfmt.h
-@@ -29,6 +29,20 @@
+@@ -28,6 +28,7 @@
+ #include <stdint.h>
  #include "simd.h"
  #include "OTprivate.hxx"
++#include "OTconfig.hxx"
  
-+#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
-+# ifdef HAVE_SYS_PARAM_H
-+#  include <sys/param.h>
-+# endif
-+#endif
-+
-+#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
-+# ifdef __BYTE_ORDER
-+#  if __BYTE_ORDER == __BIG_ENDIAN
-+#   define __BIG_ENDIAN__
-+#  endif
-+# endif
-+#endif
-+
  namespace tutils
  {
-   namespace detail

-- 
Debian packaging for openturns www.openturns.org



More information about the debian-science-commits mailing list