[Debian-astro-commits] [cspice] 04/48: d/patches: Add support for amd64 architecture

[Rock Storm]

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

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

commit 2b926eb51f8c4052ebde254ffe43bf7234d9cbb4
Author: Rock Storm <rock at rocko>
Date:   Mon Oct 31 20:55:04 2016 +0100

    d/patches: Add support for amd64 architecture
---
 .../add-support-for-amd64-architecture.patch       | 90 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 2 files changed, 92 insertions(+)

diff --git a/debian/patches/add-support-for-amd64-architecture.patch b/debian/patches/add-support-for-amd64-architecture.patch
new file mode 100644
index 0000000..56c8153
--- /dev/null
+++ b/debian/patches/add-support-for-amd64-architecture.patch
@@ -0,0 +1,90 @@
+Description: Add support for amd64 architecture
+Author: Rock Storm <rockstorm at gmx.com>
+
+--- a/include/SpiceZpl.h
++++ b/include/SpiceZpl.h
+@@ -110,8 +110,11 @@
+ #ifndef HAVE_PLATFORM_MACROS_H
+ #define HAVE_PLATFORM_MACROS_H
+  
+- 
+-   #define   CSPICE_PC_LINUX
++	#ifdef __amd64__
++   		#define	CSPICE_PC_LINUX_64BIT_GCC
++   	#else
++		#define CSPICE_PC_LINUX
++	#endif
+  
+ #endif
+  
+--- a/makeall.csh
++++ b/makeall.csh
+@@ -5,6 +5,19 @@
+ \echo cspice directory.
+ \echo
+ cd src
++
++#
++#  Set common compiler and linker options.
++#
++if ( `getconf LONG_BIT` == "64" ) then
++
++    setenv TKCOMPILEOPTIONS "-c -ansi -m64 -O2 -DNON_UNIX_STDIO -I../../include -fPIC"
++    setenv TKLINKOPTIONS "-lm -m64"
++else
++    setenv TKCOMPILEOPTIONS "-c -ansi -m32 -O2 -DNON_UNIX_STDIO -I../../include -fPIC"
++    setenv TKLINKOPTIONS "-lm -m32"
++endif
++
+ \echo
+ \echo Creating cspice
+ \echo
+@@ -17,6 +30,19 @@ cd ..
+ cd csupport
+ chmod u+x mkprodct.csh; ./mkprodct.csh
+ cd ..
++
++#
++#  Set common compiler and linker options.
++#
++if ( `getconf LONG_BIT` == "64" ) then
++
++    setenv TKCOMPILEOPTIONS "-c -ansi -m64 -O2 -DNON_UNIX_STDIO -I../../include"
++    setenv TKLINKOPTIONS "-lm -m64"
++else
++    setenv TKCOMPILEOPTIONS "-c -ansi -m32 -DNON_UNIX_STDIO -I../../include"
++    setenv TKLINKOPTIONS "-lm -m32"
++endif
++
+ \echo
+ \echo Creating brief_c
+ \echo
+@@ -41,12 +67,28 @@ cd ..
+ cd commnt_c
+ chmod u+x mkprodct.csh; ./mkprodct.csh
+ cd ..
++
++#
++#  Bring back the -O2 option for compiling in i386.
++#
++if ( `getconf LONG_BIT` == "32" ) then
++    setenv TKCOMPILEOPTIONS "-c -ansi -m32 -O2 -DNON_UNIX_STDIO -I../../include"
++endif
++
+ \echo
+ \echo Creating cook_c
+ \echo
+ cd cook_c
+ chmod u+x mkprodct.csh; ./mkprodct.csh
+ cd ..
++
++#
++#  Drop the -O2 option for compiling in i386.
++#
++if ( `getconf LONG_BIT` == "32" ) then
++    setenv TKCOMPILEOPTIONS "-c -ansi -m32 -DNON_UNIX_STDIO -I../../include"
++endif
++
+ \echo
+ \echo Creating frmdif_c
+ \echo
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3513939
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+add-support-for-amd64-architecture.patch
+

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