[Debian-astro-commits] [cspice] 17/48: Treat cookbook binaries as examples of cspice
Rock Storm
rockstorm-guest at moszumanska.debian.org
Thu Dec 15 21:32:05 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 673078fab681b08e06610729960b4326639a057f
Author: Rock Storm <rockstorm at gmx.com>
Date: Sun Nov 13 11:46:30 2016 +0100
Treat cookbook binaries as examples of cspice
---
debian/control | 15 --------
debian/cspice-cookbook.install | 5 ---
.../add-support-for-amd64-architecture.patch | 45 ++++++++++++----------
.../create-and-link-to-shared-libraries.patch | 13 +++----
.../create-lib-and-exe-missing-directories.patch | 6 +--
debian/rules | 6 +--
6 files changed, 33 insertions(+), 57 deletions(-)
diff --git a/debian/control b/debian/control
index c8a0dcb..8fe23a2 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Architecture: i386 amd64
Depends: ${shlibs:Depends},
${misc:Depends}
Recommends: cspice-doc
-Suggests: cspice-cookbook
Description: C-language SPICE Toolkit
SPICE (Spacecraft Planet Instrument C-matrix Events) is a NASA ancillary
information system used to compute geometric and event information in
@@ -69,17 +68,3 @@ Description: Documentation for CSPICE
.
This package provides user guides and module's documentation, in plain text
and html formats, for CSPICE.
-
-Package: cspice-cookbook
-Architecture: i386 amd64
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Recommends: cspice-doc
-Description: Example binaries and data for CSPICE
- SPICE (Spacecraft Planet Instrument C-matrix Events) is a NASA ancillary
- information system used to compute geometric and event information in
- analyzing and planning science observations obtained from spacecraft. It is
- also used in planning missions and conducting numerous engineering functions
- needed to carry out those missions.
- .
- This package provides example binaries and data for CSPICE.
diff --git a/debian/cspice-cookbook.install b/debian/cspice-cookbook.install
deleted file mode 100644
index 8c83766..0000000
--- a/debian/cspice-cookbook.install
+++ /dev/null
@@ -1,5 +0,0 @@
-exe/cspice-simple usr/bin
-exe/cspice-states usr/bin
-exe/cspice-subpt usr/bin
-exe/cspice-tictoc usr/bin
-
diff --git a/debian/patches/add-support-for-amd64-architecture.patch b/debian/patches/add-support-for-amd64-architecture.patch
index 56c8153..9ce7659 100644
--- a/debian/patches/add-support-for-amd64-architecture.patch
+++ b/debian/patches/add-support-for-amd64-architecture.patch
@@ -25,7 +25,7 @@ Author: Rock Storm <rockstorm at gmx.com>
cd src
+
+#
-+# Set common compiler and linker options.
++# Set common compiler and linker options for libraries.
+#
+if ( `getconf LONG_BIT` == "64" ) then
+
@@ -39,14 +39,13 @@ Author: Rock Storm <rockstorm at gmx.com>
\echo
\echo Creating cspice
\echo
-@@ -17,6 +30,19 @@ cd ..
+@@ -17,6 +30,18 @@
cd csupport
chmod u+x mkprodct.csh; ./mkprodct.csh
cd ..
+
+#
-+# Set common compiler and linker options.
-+#
++# Set common compiler and linker options for binaries.
+if ( `getconf LONG_BIT` == "64" ) then
+
+ setenv TKCOMPILEOPTIONS "-c -ansi -m64 -O2 -DNON_UNIX_STDIO -I../../include"
@@ -59,32 +58,36 @@ Author: Rock Storm <rockstorm at gmx.com>
\echo
\echo Creating brief_c
\echo
-@@ -41,12 +67,28 @@ cd ..
- cd commnt_c
+@@ -42,12 +67,6 @@
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 Creating cook_c
+-\echo
+-cd cook_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
+-cd ..
+-\echo
+ \echo Creating frmdif_c
\echo
- cd cook_c
+ cd frmdif_c
+@@ -107,5 +126,19 @@
+ cd versn_c
chmod u+x mkprodct.csh; ./mkprodct.csh
cd ..
+
+#
-+# Drop the -O2 option for compiling in i386.
++# Bring back the -O2 option for compiling in i386.
+#
+if ( `getconf LONG_BIT` == "32" ) then
-+ setenv TKCOMPILEOPTIONS "-c -ansi -m32 -DNON_UNIX_STDIO -I../../include"
++ setenv TKCOMPILEOPTIONS "-c -ansi -m32 -O2 -DNON_UNIX_STDIO -I../../include"
+endif
+
- \echo
- \echo Creating frmdif_c
- \echo
++\echo
++\echo Creating cook_c
++\echo
++cd cook_c
++chmod u+x mkprodct.csh; ./mkprodct.csh
++cd ..
+ cd ..
+ \echo Toolkit Build Complete
diff --git a/debian/patches/create-and-link-to-shared-libraries.patch b/debian/patches/create-and-link-to-shared-libraries.patch
index 3646101..c152950 100644
--- a/debian/patches/create-and-link-to-shared-libraries.patch
+++ b/debian/patches/create-and-link-to-shared-libraries.patch
@@ -5,7 +5,7 @@ From: Rock Storm <rockstorm at gmx.com>
--- a/makeall.csh
+++ b/makeall.csh
-@@ -49,23 +49,29 @@
+@@ -48,83 +48,89 @@
cd brief_c
chmod u+x mkprodct.csh; ./mkprodct.csh
cd ..
@@ -36,9 +36,7 @@ From: Rock Storm <rockstorm at gmx.com>
-chmod u+x mkprodct.csh; ./mkprodct.csh
+$COMEXE
cd ..
-
- #
-@@ -93,61 +99,61 @@
+ \echo
\echo Creating frmdif_c
\echo
cd frmdif_c
@@ -108,8 +106,8 @@ From: Rock Storm <rockstorm at gmx.com>
-chmod u+x mkprodct.csh; ./mkprodct.csh
+$COMEXE
cd ..
- cd ..
- \echo Toolkit Build Complete
+
+ #
--- a/src/brief_c/mkprodct.csh
+++ b/src/brief_c/mkprodct.csh
@@ -254,8 +254,9 @@
@@ -150,14 +148,13 @@ From: Rock Storm <rockstorm at gmx.com>
$TKLINKOPTIONS
\rm $TARGET
-@@ -213,8 +214,9 @@
+@@ -213,8 +214,8 @@
echo "Compiling and linking: " $MAIN
$TKCOMPILER $TKCOMPILEOPTIONS $TARGET
$TKCOMPILER -o $EXECUT $MAINOBJ \
- ../../lib/csupport.a \
- ../../lib/cspice.a \
+ -L../../lib \
-+ -lcsupport \
+ -lcspice \
$TKLINKOPTIONS
diff --git a/debian/patches/create-lib-and-exe-missing-directories.patch b/debian/patches/create-lib-and-exe-missing-directories.patch
index 99e40ba..646912c 100644
--- a/debian/patches/create-lib-and-exe-missing-directories.patch
+++ b/debian/patches/create-lib-and-exe-missing-directories.patch
@@ -19,10 +19,10 @@ From: Rock Storm <rockstorm at gmx.com>
+if ( ! -d exe ) then
+ mkdir exe
+endif
-
+
#
- # Set common compiler and linker options.
-@@ -18,6 +26,7 @@ else
+ # Set common compiler and linker options for libraries.
+@@ -18,6 +26,7 @@
setenv TKLINKOPTIONS "-lm -m32"
endif
diff --git a/debian/rules b/debian/rules
index 21aacbc..59b0073 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,11 +27,7 @@ exes=brief \
spkmerge \
tobin \
toxfr \
- version \
- simple \
- states \
- subpt \
- tictoc
+ version
%:
dh $@
--
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