[Debian-astro-commits] [cspice] 42/48: Add support for multiple architectures

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 9495d706abfe8de8d237c028b301a1a1f27be813
Author: Rock Storm <rockstorm at gmx.com>
Date:   Wed Dec 14 21:09:37 2016 +0100

    Add support for multiple architectures
    
    Upstream's code is slightly different for several platforms. A script
    is added to generate an architecture-dependent header file to deal with
    the differences in the code.
---
 debian/Makefile                                    |   3 +-
 debian/SpiceZplDeb.in                              |   3 +
 debian/clean                                       |   1 +
 debian/configure                                   |  96 ++++++++
 debian/control                                     |   8 +-
 debian/libcspice-dev.install                       |   1 +
 .../add-support-for-amd64-architecture.patch       |  24 --
 debian/patches/series                              |   2 +-
 .../patches/support-multiple-architectures.patch   | 271 +++++++++++++++++++++
 debian/rules                                       |   3 +
 10 files changed, 382 insertions(+), 30 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index 7329a76..e0376c4 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -27,7 +27,8 @@ LIBRARIES=cspice.a csupport.a
 ### Compiler Flags ###
 # Compiler flags are harcoded by upstream. This Makefile allows for some
 # custimization and accepts standard CC and CFLAGS
-COMMON_CFLAGS=-ansi -O2 -DNON_UNIX_STDIO -I$(INCLUDE_DIR) $(CFLAGS) $(CPPFLAGS)
+COMMON_CFLAGS=-ansi -O2 -DNON_UNIX_STDIO -I$(INCLUDE_DIR) \
+              -I$(ROOT_DIR)/debian $(CFLAGS) $(CPPFLAGS)
 COMMON_LFLAGS=-lm $(CFLAGS) $(LDFLAGS)
 
 build: build-exe build-cook
diff --git a/debian/SpiceZplDeb.in b/debian/SpiceZplDeb.in
new file mode 100644
index 0000000..645ccfb
--- /dev/null
+++ b/debian/SpiceZplDeb.in
@@ -0,0 +1,3 @@
+#ifndef HAVE_DEBIAN_PLATFORM_SPECIFICATION_H
+#define HAVE_DEBIAN_PLATFORM_SPECIFICATION_H
+
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f23ec62
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/SpiceZplDeb.h
diff --git a/debian/configure b/debian/configure
new file mode 100755
index 0000000..d2f789a
--- /dev/null
+++ b/debian/configure
@@ -0,0 +1,96 @@
+#! /bin/sh
+
+# Set tag names
+zpl_tag="ZPL_TAG"
+system_tag="SYSTEM_TAG"
+system_length="SYSTEM_TAG_LENGTH"
+os_tag="OS_TAG"
+os_length="OS_TAG_LENGTH"
+compiler_tag="COMPILER_TAG"
+compiler_length="COMPILER_TAG_LENGTH"
+endianness_tag="ENDIANNESS_TAG"
+endianness_length="ENDIANNESS_TAG_LENGTH"
+maxopn="MAXOPN"
+maxlun="MAXLUN"
+pairs="PAIRS"
+
+
+# Test whether input file exists
+input_file="debian/SpiceZplDeb.in"
+header_file="debian/SpiceZplDeb.h"
+if test -f "$input_file"; then :
+else
+    echo "Error in: $0"
+    echo "Cannot find input file: $input_file . Aborting configuration." 1>&2
+    exit 2
+fi
+
+cp "$input_file" "$header_file"
+
+
+#
+# DETEC ARCHITECTURE BITS
+#
+if test "$DEB_TARGET_ARCH_BITS" = "64" ; then
+
+    echo "    #define CSPICE_PC_LINUX_64BIT_GCC"    >> $header_file
+    echo "    #define $compiler_tag \"GCC/64BIT\""  >> $header_file
+    echo "    #define $compiler_length 9"           >> $header_file
+
+elif test "$DEB_TARGET_ARCH_BITS" = "32" ; then
+
+    echo "    #define CSPICE_PC_LINUX"              >> $header_file
+    echo "    #define $compiler_tag \"GCC\""        >> $header_file
+    echo "    #define $compiler_length 3"           >> $header_file
+
+else
+
+    echo "ERROR: Platform could not be determined." 1>&2
+    echo "DEB_TARGET_ARCH_BITS = $DEB_TARGET_ARCH_BITS" 1>&2
+    echo "Aborting configuration." 1>&2
+    exit 1
+    
+fi
+
+#
+# DETEC ARCHITECTURE ENDIANNESS
+#
+if test "$DEB_TARGET_ARCH_ENDIAN" = "little" ; then
+
+    echo "    #define $endianness_tag \"LTL-IEEE\"" >> $header_file
+    echo "    #define $endianness_length 8"         >> $header_file
+
+elif test "$DEB_TARGET_ARCH_ENDIAN" = "big" ; then
+
+    echo "    #define $endianness_tag \"BIG-IEEE\"" >> $header_file
+    echo "    #define $endianness_length 8"         >> $header_file
+
+else
+
+    echo "ERROR: Endianness could not be determined." 1>&2
+    echo "DEB_TARGET_ARCH_ENDIAN = $DEB_TARGET_ARCH_ENDIAN" 1>&2
+    echo "Aborting configuration." 1>&2
+    exit 1
+
+fi
+
+#
+# DETEC ARCHITECTURE
+#
+if "$DEB_TARGET_ARCH" = "" ; then :
+else
+
+    echo "    #define $maxopn 99"                   >> $header_file
+    echo "    #define $maxlun 96"                   >> $header_file
+    echo "    #define $pairs  20"                   >> $header_file
+
+fi
+
+
+echo "    #define $system_tag \"PC\""           >> $header_file
+echo "    #define $system_length 2"             >> $header_file
+echo "    #define $os_tag \"LINUX\""            >> $header_file
+echo "    #define $os_length 5"                 >> $header_file
+
+echo ""       >> $header_file
+echo "#endif" >> $header_file
diff --git a/debian/control b/debian/control
index b6c9544..af1e10e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Uploaders: Rock Storm <rockstorm at gmx.com>
 Section: science
 Priority: extra
 Build-Depends: debhelper (>= 9),
-               csh (>= 20110502)
+               csh
 Standards-Version: 3.9.8
 Homepage: http://naif.jpl.nasa.gov/naif/
 #Vcs-Git: 
 #Vcs-Browser: 
 
 Package: cspice
-Architecture: i386 amd64
+Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: cspice-doc
@@ -25,7 +25,7 @@ Description: C-language SPICE Toolkit
  This package provides the different utilities comprising CSPICE.
 
 Package: libcspice-dev
-Architecture: i386 amd64
+Architecture: any
 Section: libdevel
 Depends: libcspice1 (= ${binary:Version}),
          ${misc:Depends}
@@ -39,7 +39,7 @@ Description: Development files for CSPICE
  This package provides header files and static libraries for CSPICE.
 
 Package: libcspice1
-Architecture: i386 amd64
+Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/libcspice-dev.install b/debian/libcspice-dev.install
index 6196bf2..e6e58f9 100644
--- a/debian/libcspice-dev.install
+++ b/debian/libcspice-dev.install
@@ -1,3 +1,4 @@
 include/*.h usr/include/cspice
+debian/SpiceZplDeb.h usr/include/cspice
 lib/lib*.so usr/lib
 lib/lib*.a usr/lib
diff --git a/debian/patches/add-support-for-amd64-architecture.patch b/debian/patches/add-support-for-amd64-architecture.patch
deleted file mode 100644
index 1f71559..0000000
--- a/debian/patches/add-support-for-amd64-architecture.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Add support for amd64 architecture
-Author: Rock Storm <rockstorm at gmx.com>
-
---- a/include/SpiceZpl.h
-+++ b/include/SpiceZpl.h
-@@ -109,9 +109,15 @@
-  
- #ifndef HAVE_PLATFORM_MACROS_H
- #define HAVE_PLATFORM_MACROS_H
-- 
-- 
--   #define   CSPICE_PC_LINUX
-+
-+	#include <stdint.h>
-+	#if INTPTR_MAX == INT64_MAX
-+   		#define	CSPICE_PC_LINUX_64BIT_GCC
-+   	#elif INTPTR_MAX == INT32_MAX
-+		#define CSPICE_PC_LINUX
-+	#else
-+		#error "Failed to detect whether environment is 32 or 64-bit."
-+	#endif
-  
- #endif
-  
diff --git a/debian/patches/series b/debian/patches/series
index c3c81e9..5f093a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-add-support-for-amd64-architecture.patch
+support-multiple-architectures
 create-and-link-to-shared-libraries.patch
 fix-spelling-errors.patch
diff --git a/debian/patches/support-multiple-architectures.patch b/debian/patches/support-multiple-architectures.patch
new file mode 100644
index 0000000..763cfaa
--- /dev/null
+++ b/debian/patches/support-multiple-architectures.patch
@@ -0,0 +1,271 @@
+Description: Add support for amd64 architecture
+Author: Rock Storm <rockstorm at gmx.com>
+
+--- a/include/SpiceZpl.h
++++ b/include/SpiceZpl.h
+@@ -109,9 +109,10 @@
+  
+ #ifndef HAVE_PLATFORM_MACROS_H
+ #define HAVE_PLATFORM_MACROS_H
+- 
+- 
+-   #define   CSPICE_PC_LINUX
++
++    #ifndef HAVE_DEBIAN_PLATFORM_SPECIFICATION_H
++        #include "SpiceZplDeb.h"
++    #endif
+  
+ #endif
+  
+--- a/src/cspice/zzplatfm.c
++++ b/src/cspice/zzplatfm.c
+@@ -346,10 +346,10 @@
+ 
+ /*        Platform/Environment specific assignments follow. */
+ 
+-	s_copy(attcpy + 32, "PC", (ftnlen)32, (ftnlen)2);
+-	s_copy(attcpy + 64, "LINUX", (ftnlen)32, (ftnlen)5);
+-	s_copy(attcpy + 96, "GCC", (ftnlen)32, (ftnlen)3);
+-	s_copy(attcpy + 128, "LTL-IEEE", (ftnlen)32, (ftnlen)8);
++	s_copy(attcpy + 32, SYSTEM_TAG, (ftnlen)32, (ftnlen)SYSTEM_TAG_LENGTH);
++	s_copy(attcpy + 64, OS_TAG, (ftnlen)32, (ftnlen)OS_TAG_LENGTH);
++	s_copy(attcpy + 96, COMPILER_TAG, (ftnlen)32, (ftnlen)COMPILER_TAG_LENGTH);
++	s_copy(attcpy + 128, ENDIANNESS_TAG, (ftnlen)32, (ftnlen)ENDIANNESS_TAG_LENGTH);
+ 	s_copy(attcpy + 160, "LF", (ftnlen)32, (ftnlen)2);
+ 	s_copy(attcpy + 192, "BIG-IEEE LTL-IEEE", (ftnlen)32, (ftnlen)17);
+ 
+--- a/src/cspice/fndlun.c
++++ b/src/cspice/fndlun.c
+@@ -23,7 +23,7 @@
+ 
+     /* Local variables */
+     static integer i__;
+-    static logical resvd[99], opened;
++    static logical resvd[MAXLUN], opened;
+     static integer iostat;
+ 
+ /* $ Abstract */
+@@ -521,13 +521,13 @@
+ /*     Initialize RESVD if it hasn't already been done. */
+ 
+     if (first) {
+-	for (i__ = 1; i__ <= 99; ++i__) {
+-	    resvd[(i__1 = i__ - 1) < 99 && 0 <= i__1 ? i__1 : s_rnge("resvd", 
++	for (i__ = 1; i__ <= MAXLUN; ++i__) {
++	    resvd[(i__1 = i__ - 1) < MAXLUN && 0 <= i__1 ? i__1 : s_rnge("resvd", 
+ 		    i__1, "fndlun_", (ftnlen)533)] = FALSE_;
+ 	}
+ 	for (i__ = 1; i__ <= 3; ++i__) {
+ 	    resvd[(i__2 = resnum[(i__1 = i__ - 1) < 3 && 0 <= i__1 ? i__1 : 
+-		    s_rnge("resnum", i__1, "fndlun_", (ftnlen)537)] - 1) < 99 
++		    s_rnge("resnum", i__1, "fndlun_", (ftnlen)537)] - 1) < MAXLUN 
+ 		    && 0 <= i__2 ? i__2 : s_rnge("resvd", i__2, "fndlun_", (
+ 		    ftnlen)537)] = TRUE_;
+ 	}
+@@ -538,8 +538,8 @@
+ /*     Cycle through the available units. Skip reserved units, */
+ /*     INQUIRE about others. */
+ 
+-    for (i__ = last + 1; i__ <= 99; ++i__) {
+-	if (resvd[(i__1 = i__ - 1) < 99 && 0 <= i__1 ? i__1 : s_rnge("resvd", 
++    for (i__ = last + 1; i__ <= MAXLUN; ++i__) {
++	if (resvd[(i__1 = i__ - 1) < MAXLUN && 0 <= i__1 ? i__1 : s_rnge("resvd", 
+ 		i__1, "fndlun_", (ftnlen)551)]) {
+ 	    opened = TRUE_;
+ 	} else {
+@@ -579,7 +579,7 @@
+ 
+     i__1 = last;
+     for (i__ = 1; i__ <= i__1; ++i__) {
+-	if (resvd[(i__2 = i__ - 1) < 99 && 0 <= i__2 ? i__2 : s_rnge("resvd", 
++	if (resvd[(i__2 = i__ - 1) < MAXLUN && 0 <= i__2 ? i__2 : s_rnge("resvd", 
+ 		i__2, "fndlun_", (ftnlen)578)]) {
+ 	    opened = TRUE_;
+ 	} else {
+@@ -801,13 +801,13 @@
+ /*     Initialize RESVD if it hasn't already been done. */
+ 
+     if (first) {
+-	for (i__ = 1; i__ <= 99; ++i__) {
+-	    resvd[(i__1 = i__ - 1) < 99 && 0 <= i__1 ? i__1 : s_rnge("resvd", 
++	for (i__ = 1; i__ <= MAXLUN; ++i__) {
++	    resvd[(i__1 = i__ - 1) < MAXLUN && 0 <= i__1 ? i__1 : s_rnge("resvd", 
+ 		    i__1, "fndlun_", (ftnlen)801)] = FALSE_;
+ 	}
+ 	for (i__ = 1; i__ <= 3; ++i__) {
+ 	    resvd[(i__2 = resnum[(i__1 = i__ - 1) < 3 && 0 <= i__1 ? i__1 : 
+-		    s_rnge("resnum", i__1, "fndlun_", (ftnlen)805)] - 1) < 99 
++		    s_rnge("resnum", i__1, "fndlun_", (ftnlen)805)] - 1) < MAXLUN 
+ 		    && 0 <= i__2 ? i__2 : s_rnge("resvd", i__2, "fndlun_", (
+ 		    ftnlen)805)] = TRUE_;
+ 	}
+@@ -817,8 +817,8 @@
+ /*     If UNIT is in the proper range, set the corresponding flag */
+ /*     to TRUE. */
+ 
+-    if (*unit >= 1 && *unit <= 99) {
+-	resvd[(i__1 = *unit - 1) < 99 && 0 <= i__1 ? i__1 : s_rnge("resvd", 
++    if (*unit >= 1 && *unit <= MAXLUN) {
++	resvd[(i__1 = *unit - 1) < MAXLUN && 0 <= i__1 ? i__1 : s_rnge("resvd", 
+ 		i__1, "fndlun_", (ftnlen)817)] = TRUE_;
+     }
+     return 0;
+@@ -1011,14 +1011,14 @@
+ /*     Initialize RESVD if it hasn't already been done. */
+ 
+     if (first) {
+-	for (i__ = 1; i__ <= 99; ++i__) {
+-	    resvd[(i__1 = i__ - 1) < 99 && 0 <= i__1 ? i__1 : s_rnge("resvd", 
++	for (i__ = 1; i__ <= MAXLUN; ++i__) {
++	    resvd[(i__1 = i__ - 1) < MAXLUN && 0 <= i__1 ? i__1 : s_rnge("resvd", 
+ 		    i__1, "fndlun_", (ftnlen)1022)] = FALSE_;
+ 	}
+ 	for (i__ = 1; i__ <= 3; ++i__) {
+ 	    resvd[(i__2 = resnum[(i__1 = i__ - 1) < 3 && 0 <= i__1 ? i__1 : 
+ 		    s_rnge("resnum", i__1, "fndlun_", (ftnlen)1026)] - 1) < 
+-		    99 && 0 <= i__2 ? i__2 : s_rnge("resvd", i__2, "fndlun_", 
++		    MAXLUN && 0 <= i__2 ? i__2 : s_rnge("resvd", i__2, "fndlun_", 
+ 		    (ftnlen)1026)] = TRUE_;
+ 	}
+ 	first = FALSE_;
+@@ -1027,14 +1027,14 @@
+ /*     If UNIT is in the proper range and it has not been reserved by */
+ /*     default, set the corresponding flag to FALSE. */
+ 
+-    if (*unit >= 1 && *unit <= 99) {
++    if (*unit >= 1 && *unit <= MAXLUN) {
+ 	for (i__ = 1; i__ <= 3; ++i__) {
+ 	    if (*unit == resnum[(i__1 = i__ - 1) < 3 && 0 <= i__1 ? i__1 : 
+ 		    s_rnge("resnum", i__1, "fndlun_", (ftnlen)1040)]) {
+ 		return 0;
+ 	    }
+ 	}
+-	resvd[(i__1 = *unit - 1) < 99 && 0 <= i__1 ? i__1 : s_rnge("resvd", 
++	resvd[(i__1 = *unit - 1) < MAXLUN && 0 <= i__1 ? i__1 : s_rnge("resvd", 
+ 		i__1, "fndlun_", (ftnlen)1045)] = FALSE_;
+     }
+     return 0;
+--- a/src/cspice/rdtext.c
++++ b/src/cspice/rdtext.c
+@@ -41,7 +41,7 @@
+     integer unit, i__;
+     extern /* Subroutine */ int chkin_(char *, ftnlen), errch_(char *, char *,
+ 	     ftnlen, ftnlen);
+-    static integer index, units[96];
++    static integer index, units[MAXOPN];
+     extern integer isrchi_(integer *, integer *, integer *);
+     integer number;
+     extern /* Subroutine */ int sigerr_(char *, ftnlen), chkout_(char *, 
+@@ -637,7 +637,7 @@
+ /*           need a free logical unit. But only if we don't */
+ /*           have too many files open already. */
+ 
+-	    if (n == 96) {
++	    if (n == MAXOPN) {
+ 		setmsg_("Too many files open already.", (ftnlen)28);
+ 		sigerr_("SPICE(TOOMANYFILESOPEN)", (ftnlen)23);
+ 		chkout_("RDTEXT", (ftnlen)6);
+@@ -676,12 +676,12 @@
+ /*               - The index of the file within the UNITS array. */
+ 
+ 	    ++n;
+-	    units[(i__1 = n - 1) < 96 && 0 <= i__1 ? i__1 : s_rnge("units", 
++	    units[(i__1 = n - 1) < MAXOPN && 0 <= i__1 ? i__1 : s_rnge("units", 
+ 		    i__1, "rdtext_", (ftnlen)659)] = unit;
+ 	    index = n;
+ 	}
+ 	s_copy(lstfil, file, (ftnlen)255, file_len);
+-	lstunt = units[(i__1 = index - 1) < 96 && 0 <= i__1 ? i__1 : s_rnge(
++	lstunt = units[(i__1 = index - 1) < MAXOPN && 0 <= i__1 ? i__1 : s_rnge(
+ 		"units", i__1, "rdtext_", (ftnlen)665)];
+     }
+ 
+@@ -711,15 +711,15 @@
+     *eof = iostat < 0;
+     if (iostat != 0) {
+ 	cl__1.cerr = 0;
+-	cl__1.cunit = units[(i__1 = index - 1) < 96 && 0 <= i__1 ? i__1 : 
++	cl__1.cunit = units[(i__1 = index - 1) < MAXOPN && 0 <= i__1 ? i__1 : 
+ 		s_rnge("units", i__1, "rdtext_", (ftnlen)689)];
+ 	cl__1.csta = 0;
+ 	f_clos(&cl__1);
+ 	i__1 = n;
+ 	for (i__ = index + 1; i__ <= i__1; ++i__) {
+-	    units[(i__2 = i__ - 2) < 96 && 0 <= i__2 ? i__2 : s_rnge("units", 
++	    units[(i__2 = i__ - 2) < MAXOPN && 0 <= i__2 ? i__2 : s_rnge("units", 
+ 		    i__2, "rdtext_", (ftnlen)692)] = units[(i__3 = i__ - 1) < 
+-		    96 && 0 <= i__3 ? i__3 : s_rnge("units", i__3, "rdtext_", 
++		    MAXOPN && 0 <= i__3 ? i__3 : s_rnge("units", i__3, "rdtext_", 
+ 		    (ftnlen)692)];
+ 	}
+ 	--n;
+@@ -971,11 +971,11 @@
+     index = isrchi_(&number, &n, units);
+     if (index > 0) {
+ 	cl__1.cerr = 0;
+-	cl__1.cunit = units[(i__1 = index - 1) < 96 && 0 <= i__1 ? i__1 : 
++	cl__1.cunit = units[(i__1 = index - 1) < MAXOPN && 0 <= i__1 ? i__1 : 
+ 		s_rnge("units", i__1, "rdtext_", (ftnlen)952)];
+ 	cl__1.csta = 0;
+ 	f_clos(&cl__1);
+-	if (units[(i__1 = index - 1) < 96 && 0 <= i__1 ? i__1 : s_rnge("units"
++	if (units[(i__1 = index - 1) < MAXOPN && 0 <= i__1 ? i__1 : s_rnge("units"
+ 		, i__1, "rdtext_", (ftnlen)954)] == lstunt) {
+ 	    s_copy(lstfil, " ", (ftnlen)255, (ftnlen)1);
+ 	}
+@@ -985,9 +985,9 @@
+ 
+ 	i__1 = n;
+ 	for (i__ = index + 1; i__ <= i__1; ++i__) {
+-	    units[(i__2 = i__ - 2) < 96 && 0 <= i__2 ? i__2 : s_rnge("units", 
++	    units[(i__2 = i__ - 2) < MAXOPN && 0 <= i__2 ? i__2 : s_rnge("units", 
+ 		    i__2, "rdtext_", (ftnlen)963)] = units[(i__3 = i__ - 1) < 
+-		    96 && 0 <= i__3 ? i__3 : s_rnge("units", i__3, "rdtext_", 
++		    MAXOPN && 0 <= i__3 ? i__3 : s_rnge("units", i__3, "rdtext_", 
+ 		    (ftnlen)963)];
+ 	}
+ 	--n;
+--- a/src/cspice/stmp03.c
++++ b/src/cspice/stmp03.c
+@@ -27,7 +27,7 @@
+     extern /* Subroutine */ int chkin_(char *, ftnlen);
+     extern doublereal dpmax_(void);
+     extern /* Subroutine */ int errdp_(char *, doublereal *, ftnlen);
+-    static doublereal pairs[20], lbound;
++    static doublereal pairs[PAIRS], lbound;
+     extern /* Subroutine */ int sigerr_(char *, ftnlen), chkout_(char *, 
+ 	    ftnlen), setmsg_(char *, ftnlen);
+ 
+@@ -563,8 +563,8 @@
+ 
+     if (first) {
+ 	first = FALSE_;
+-	for (i__ = 1; i__ <= 20; ++i__) {
+-	    pairs[(i__1 = i__ - 1) < 20 && 0 <= i__1 ? i__1 : s_rnge("pairs", 
++	for (i__ = 1; i__ <= PAIRS; ++i__) {
++	    pairs[(i__1 = i__ - 1) < PAIRS && 0 <= i__1 ? i__1 : s_rnge("pairs", 
+ 		    i__1, "stmp03_", (ftnlen)589)] = 1. / ((doublereal) i__ * 
+ 		    (doublereal) (i__ + 1));
+ 	}
+@@ -694,8 +694,8 @@
+ /*     LPAIR3 will be 18. */
+ 
+     *c3 = 1.;
+-    for (i__ = 20; i__ >= 4; i__ += -2) {
+-	*c3 = 1. - *x * pairs[(i__1 = i__ - 1) < 20 && 0 <= i__1 ? i__1 : 
++    for (i__ = PAIRS; i__ >= 4; i__ += -2) {
++	*c3 = 1. - *x * pairs[(i__1 = i__ - 1) < PAIRS && 0 <= i__1 ? i__1 : 
+ 		s_rnge("pairs", i__1, "stmp03_", (ftnlen)733)] * *c3;
+     }
+     *c3 = pairs[1] * *c3;
+@@ -722,8 +722,8 @@
+ /*     LPAIR2 will be 17. */
+ 
+     *c2 = 1.;
+-    for (i__ = 19; i__ >= 3; i__ += -2) {
+-	*c2 = 1. - *x * pairs[(i__1 = i__ - 1) < 20 && 0 <= i__1 ? i__1 : 
++    for (i__ = PAIRS-1; i__ >= 3; i__ += -2) {
++	*c2 = 1. - *x * pairs[(i__1 = i__ - 1) < PAIRS && 0 <= i__1 ? i__1 : 
+ 		s_rnge("pairs", i__1, "stmp03_", (ftnlen)764)] * *c2;
+     }
+     *c2 = pairs[0] * *c2;
diff --git a/debian/rules b/debian/rules
index 1062a96..01dd6c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,9 @@ exes=brief \
 #override_dh_auto_configure:
 #	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 
+override_dh_auto_configure:
+	/bin/sh debian/configure
+
 override_dh_auto_build:
 	make -f debian/Makefile build
 	dh_auto_build

-- 
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