[Debian-astro-commits] [cspice] 16/48: d/patches: Add shared libs' missing dependencies

[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 3cb4a8aba6827dd57180291b3a66a6624904f22f
Author: Rock Storm <rockstorm at gmx.com>
Date:   Sun Nov 6 14:34:38 2016 +0100

    d/patches: Add shared libs' missing dependencies
---
 .../create-and-link-to-shared-libraries.patch      | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/patches/create-and-link-to-shared-libraries.patch b/debian/patches/create-and-link-to-shared-libraries.patch
index 5b7ad35..3646101 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 @@ endif
+@@ -49,23 +49,29 @@
  cd brief_c
  chmod u+x mkprodct.csh; ./mkprodct.csh
  cd ..
@@ -38,7 +38,7 @@ From: Rock Storm <rockstorm at gmx.com>
  cd ..
  
  #
-@@ -93,61 +99,61 @@ endif
+@@ -93,61 +99,61 @@
  \echo Creating frmdif_c
  \echo
  cd frmdif_c
@@ -112,7 +112,7 @@ From: Rock Storm <rockstorm at gmx.com>
  \echo Toolkit Build Complete
 --- a/src/brief_c/mkprodct.csh
 +++ b/src/brief_c/mkprodct.csh
-@@ -254,8 +254,9 @@ if ( $status == 0 ) then
+@@ -254,8 +254,9 @@
           $TKCOMPILER    $TKCOMPILEOPTIONS $TARGET
           $TKCOMPILER -o $EXECUT           $MAINOBJ             \
                                            locallib.a           \
@@ -124,7 +124,7 @@ From: Rock Storm <rockstorm at gmx.com>
                                            $TKLINKOPTIONS    
  
           \rm $TARGET
-@@ -267,8 +268,9 @@ if ( $status == 0 ) then
+@@ -267,8 +268,9 @@
           echo "Compiling and linking: "   $MAIN     
           $TKCOMPILER    $TKCOMPILEOPTIONS $TARGET
           $TKCOMPILER -o $EXECUT           $MAINOBJ             \
@@ -138,7 +138,7 @@ From: Rock Storm <rockstorm at gmx.com>
           \rm $TARGET
 --- a/src/cook_c/mkprodct.csh
 +++ b/src/cook_c/mkprodct.csh
-@@ -200,8 +200,9 @@ if ( $status == 0 ) then
+@@ -200,8 +200,9 @@
           $TKCOMPILER    $TKCOMPILEOPTIONS $TARGET
           $TKCOMPILER -o $EXECUT           $MAINOBJ             \
                                            locallib.a           \
@@ -150,7 +150,7 @@ From: Rock Storm <rockstorm at gmx.com>
                                            $TKLINKOPTIONS    
  
           \rm $TARGET
-@@ -213,8 +214,9 @@ if ( $status == 0 ) then
+@@ -213,8 +214,9 @@
           echo "Compiling and linking: "   $MAIN     
           $TKCOMPILER    $TKCOMPILEOPTIONS $TARGET
           $TKCOMPILER -o $EXECUT           $MAINOBJ             \
@@ -164,7 +164,7 @@ From: Rock Storm <rockstorm at gmx.com>
           \rm $TARGET
 --- a/src/cspice/mkprodct.csh
 +++ b/src/cspice/mkprodct.csh
-@@ -189,7 +189,11 @@ echo " "
+@@ -189,7 +189,11 @@
  #   Determine a provisional LIBRARY name.
  #
     foreach item ( `pwd` )
@@ -176,22 +176,22 @@ From: Rock Storm <rockstorm at gmx.com>
     end
  
  #
-@@ -223,6 +227,12 @@ endif
+@@ -223,6 +227,12 @@
  
  if ( $status == 0 ) then
  
 +   echo "      Inserting objects in the shared library $SL_REALNAME ..."
-+   $TKCOMPILER -shared -Wl,-soname,$SL_SONAME -o $SL_REALNAME *.o
++   $TKCOMPILER -shared -Wl,-soname,$SL_SONAME -o $SL_REALNAME *.o -lm
 +   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 " "
+@@ -188,7 +188,11 @@
  #   Determine a provisional LIBRARY name.
  #
     foreach item ( `pwd` )
@@ -203,16 +203,16 @@ From: Rock Storm <rockstorm at gmx.com>
     end
  
  #
-@@ -222,6 +226,12 @@ endif
+@@ -222,6 +226,12 @@
  
  if ( $status == 0 ) then
  
 +   echo "      Inserting objects in the shared library $SL_REALNAME ..."
-+   $TKCOMPILER -shared -Wl,-soname,$SL_SONAME -o $SL_REALNAME *.o
++   $TKCOMPILER -shared -Wl,-soname,$SL_SONAME -o $SL_REALNAME *.o -lm -lcspice -L../../lib
 +   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

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