[Debian-astro-commits] [cspice] 39/48: d/p/64bit-supp: Rewrite the arch determination

Rock Storm rockstorm-guest at moszumanska.debian.org
Thu Dec 15 21:32:09 UTC 2016


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

rockstorm-guest pushed a commit to branch debian
in repository cspice.

commit 13874dea8e61e7e249de7d4831ee5fcaef46cd3a
Author: Rock Storm <rockstorm at gmx.com>
Date:   Sun Dec 4 16:34:09 2016 +0100

    d/p/64bit-supp: Rewrite the arch determination
---
 debian/patches/add-support-for-amd64-architecture.patch | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/patches/add-support-for-amd64-architecture.patch b/debian/patches/add-support-for-amd64-architecture.patch
index 33dc2f3..1f71559 100644
--- a/debian/patches/add-support-for-amd64-architecture.patch
+++ b/debian/patches/add-support-for-amd64-architecture.patch
@@ -3,16 +3,21 @@ Author: Rock Storm <rockstorm at gmx.com>
 
 --- a/include/SpiceZpl.h
 +++ b/include/SpiceZpl.h
-@@ -110,8 +110,11 @@
+@@ -109,9 +109,15 @@
+  
  #ifndef HAVE_PLATFORM_MACROS_H
  #define HAVE_PLATFORM_MACROS_H
-  
+- 
 - 
 -   #define   CSPICE_PC_LINUX
-+	#ifdef __amd64__
++
++	#include <stdint.h>
++	#if INTPTR_MAX == INT64_MAX
 +   		#define	CSPICE_PC_LINUX_64BIT_GCC
-+   	#else
++   	#elif INTPTR_MAX == INT32_MAX
 +		#define CSPICE_PC_LINUX
++	#else
++		#error "Failed to detect whether environment is 32 or 64-bit."
 +	#endif
   
  #endif

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



More information about the Debian-astro-commits mailing list