[Debian-astro-commits] [cspice] 19/48: d/patches: Link against csupport static library

[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 0fc9ce4f02f4e5f72930c8d0bdb9cfa1b37861fd
Author: Rock Storm <rockstorm at gmx.com>
Date:   Sun Nov 13 16:26:41 2016 +0100

    d/patches: Link against csupport static library
---
 .../create-and-link-to-shared-libraries.patch      | 50 ++++------------------
 1 file changed, 8 insertions(+), 42 deletions(-)

diff --git a/debian/patches/create-and-link-to-shared-libraries.patch b/debian/patches/create-and-link-to-shared-libraries.patch
index c152950..98954b6 100644
--- a/debian/patches/create-and-link-to-shared-libraries.patch
+++ b/debian/patches/create-and-link-to-shared-libraries.patch
@@ -110,49 +110,42 @@ From: Rock Storm <rockstorm at gmx.com>
  #
 --- a/src/brief_c/mkprodct.csh
 +++ b/src/brief_c/mkprodct.csh
-@@ -254,8 +254,9 @@
-          $TKCOMPILER    $TKCOMPILEOPTIONS $TARGET
+@@ -255,7 +255,8 @@
           $TKCOMPILER -o $EXECUT           $MAINOBJ             \
                                            locallib.a           \
--                                          ../../lib/csupport.a \
+                                           ../../lib/csupport.a \
 -                                          ../../lib/cspice.a   \
 +                                          -L../../lib          \
-+                                          -lcsupport           \
 +                                          -lcspice             \
                                            $TKLINKOPTIONS    
  
           \rm $TARGET
-@@ -267,8 +268,9 @@
-          echo "Compiling and linking: "   $MAIN     
+@@ -268,7 +269,8 @@
           $TKCOMPILER    $TKCOMPILEOPTIONS $TARGET
           $TKCOMPILER -o $EXECUT           $MAINOBJ             \
--                                          ../../lib/csupport.a \
+                                           ../../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 @@
-          $TKCOMPILER    $TKCOMPILEOPTIONS $TARGET
+@@ -201,7 +201,8 @@
           $TKCOMPILER -o $EXECUT           $MAINOBJ             \
                                            locallib.a           \
--                                          ../../lib/csupport.a \
+                                           ../../lib/csupport.a \
 -                                          ../../lib/cspice.a   \
 +                                          -L../../lib          \
-+                                          -lcsupport           \
 +                                          -lcspice             \
                                            $TKLINKOPTIONS    
  
           \rm $TARGET
-@@ -213,8 +214,8 @@
-          echo "Compiling and linking: "   $MAIN     
+@@ -214,7 +215,8 @@
           $TKCOMPILER    $TKCOMPILEOPTIONS $TARGET
           $TKCOMPILER -o $EXECUT           $MAINOBJ             \
--                                          ../../lib/csupport.a \
+                                           ../../lib/csupport.a \
 -                                          ../../lib/cspice.a   \
 +                                          -L../../lib          \
 +                                          -lcspice             \
@@ -186,30 +179,3 @@ From: Rock Storm <rockstorm at gmx.com>
     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 @@
- #   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 @@
- 
- if ( $status == 0 ) then
- 
-+   echo "      Inserting objects in the shared library $SL_REALNAME ..."
-+   $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