[Debian-astro-commits] [cspice] 05/48: d/patches: Create and link to shared libraries
Rock Storm
rockstorm-guest at moszumanska.debian.org
Thu Dec 15 21:32:04 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 6207e9d8b233527d32882ceb31b1d419053f56e7
Author: Rock Storm <rockstorm at gmx.com>
Date: Mon Oct 31 20:58:22 2016 +0100
d/patches: Create and link to shared libraries
Modify the building sequence to generate shared libraries apart from
the static ones and link the executables to them.
---
.../create-and-link-to-shared-libraries.patch | 218 +++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 219 insertions(+)
diff --git a/debian/patches/create-and-link-to-shared-libraries.patch b/debian/patches/create-and-link-to-shared-libraries.patch
new file mode 100644
index 0000000..5b7ad35
--- /dev/null
+++ b/debian/patches/create-and-link-to-shared-libraries.patch
@@ -0,0 +1,218 @@
+Subject: Add creation and linking to shared libraries
+ Modify the building sequence to generate shared libraries apart from
+ the static ones and link the executables to them.
+From: Rock Storm <rockstorm at gmx.com>
+
+--- a/makeall.csh
++++ b/makeall.csh
+@@ -49,23 +49,29 @@ endif
+ cd brief_c
+ chmod u+x mkprodct.csh; ./mkprodct.csh
+ cd ..
++
++#
++# Set common executable.
++#
++setenv COMEXE "./../brief_c/mkprodct.csh"
++
+ \echo
+ \echo Creating chrnos_c
+ \echo
+ cd chrnos_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating ckbref_c
+ \echo
+ cd ckbref_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating commnt_c
+ \echo
+ cd commnt_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+
+ #
+@@ -93,61 +99,61 @@ endif
+ \echo Creating frmdif_c
+ \echo
+ cd frmdif_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating inspkt_c
+ \echo
+ cd inspkt_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating mkspk_c
+ \echo
+ cd mkspk_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating msopck_c
+ \echo
+ cd msopck_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating spacit_c
+ \echo
+ cd spacit_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating spkdif_c
+ \echo
+ cd spkdif_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating spkmrg_c
+ \echo
+ cd spkmrg_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating tobin_c
+ \echo
+ cd tobin_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating toxfr_c
+ \echo
+ cd toxfr_c
+-chmod u+x mkprodct.csh; ./mkprodct.csh
++$COMEXE
+ cd ..
+ \echo
+ \echo Creating versn_c
+ \echo
+ cd versn_c
+-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 @@ if ( $status == 0 ) then
+ $TKCOMPILER $TKCOMPILEOPTIONS $TARGET
+ $TKCOMPILER -o $EXECUT $MAINOBJ \
+ locallib.a \
+- ../../lib/csupport.a \
+- ../../lib/cspice.a \
++ -L../../lib \
++ -lcsupport \
++ -lcspice \
+ $TKLINKOPTIONS
+
+ \rm $TARGET
+@@ -267,8 +268,9 @@ if ( $status == 0 ) then
+ echo "Compiling and linking: " $MAIN
+ $TKCOMPILER $TKCOMPILEOPTIONS $TARGET
+ $TKCOMPILER -o $EXECUT $MAINOBJ \
+- ../../lib/csupport.a \
+- ../../lib/cspice.a \
++ -L../../lib \
++ -lcsupport \
++ -lcspice \
+ $TKLINKOPTIONS
+
+ \rm $TARGET
+--- a/src/cook_c/mkprodct.csh
++++ b/src/cook_c/mkprodct.csh
+@@ -200,8 +200,9 @@ if ( $status == 0 ) then
+ $TKCOMPILER $TKCOMPILEOPTIONS $TARGET
+ $TKCOMPILER -o $EXECUT $MAINOBJ \
+ locallib.a \
+- ../../lib/csupport.a \
+- ../../lib/cspice.a \
++ -L../../lib \
++ -lcsupport \
++ -lcspice \
+ $TKLINKOPTIONS
+
+ \rm $TARGET
+@@ -213,8 +214,9 @@ if ( $status == 0 ) then
+ echo "Compiling and linking: " $MAIN
+ $TKCOMPILER $TKCOMPILEOPTIONS $TARGET
+ $TKCOMPILER -o $EXECUT $MAINOBJ \
+- ../../lib/csupport.a \
+- ../../lib/cspice.a \
++ -L../../lib \
++ -lcsupport \
++ -lcspice \
+ $TKLINKOPTIONS
+
+ \rm $TARGET
+--- a/src/cspice/mkprodct.csh
++++ b/src/cspice/mkprodct.csh
+@@ -189,7 +189,11 @@ echo " "
+ # Determine a provisional LIBRARY name.
+ #
+ foreach item ( `pwd` )
++ set LIBDIR = "../../lib/"
+ set LIBRARY = "../../lib/"$item:t
++ set SL_REALNAME = "lib"$item:t".so.1.0.0"
++ set SL_SONAME = "lib"$item:t".so.1"
++ set SL_LINKERNAME = "lib"$item:t".so"
+ end
+
+ #
+@@ -223,6 +227,12 @@ endif
+
+ if ( $status == 0 ) then
+
++ echo " Inserting objects in the shared library $SL_REALNAME ..."
++ $TKCOMPILER -shared -Wl,-soname,$SL_SONAME -o $SL_REALNAME *.o
++ mv $SL_REALNAME $LIBDIR
++ ln -sf $SL_REALNAME $LIBDIR$SL_SONAME
++ ln -sf $SL_REALNAME $LIBDIR$SL_LINKERNAME
++
+ echo " Inserting objects in the library $LIBRARY ..."
+ ar crv $LIBRARY.a *.o
+ ranlib $LIBRARY.a
+--- a/src/csupport/mkprodct.csh
++++ b/src/csupport/mkprodct.csh
+@@ -188,7 +188,11 @@ echo " "
+ # Determine a provisional LIBRARY name.
+ #
+ foreach item ( `pwd` )
++ set LIBDIR = "../../lib/"
+ set LIBRARY = "../../lib/"$item:t
++ set SL_REALNAME = "lib"$item:t".so.1.0.0"
++ set SL_SONAME = "lib"$item:t".so.1"
++ set SL_LINKERNAME = "lib"$item:t".so"
+ end
+
+ #
+@@ -222,6 +226,12 @@ endif
+
+ if ( $status == 0 ) then
+
++ echo " Inserting objects in the shared library $SL_REALNAME ..."
++ $TKCOMPILER -shared -Wl,-soname,$SL_SONAME -o $SL_REALNAME *.o
++ mv $SL_REALNAME $LIBDIR
++ ln -sf $SL_REALNAME $LIBDIR$SL_SONAME
++ ln -sf $SL_REALNAME $LIBDIR$SL_LINKERNAME
++
+ echo " Inserting objects in the library $LIBRARY ..."
+ ar crv $LIBRARY.a *.o
+ ranlib $LIBRARY.a
diff --git a/debian/patches/series b/debian/patches/series
index 3513939..b043f4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
add-support-for-amd64-architecture.patch
+create-and-link-to-shared-libraries.patch
--
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