[Debian-astro-commits] [wcslib] 04/06: Remove unneeded libs from linking

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository wcslib.

commit 48f814b74b26a81f851a220440ebf7646f43b278
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Jun 27 12:08:24 2016 +0200

    Remove unneeded libs from linking
---
 debian/patches/add_CPGPLOT.patch | 9 ---------
 debian/patches/dynlink.patch     | 5 +++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/patches/add_CPGPLOT.patch b/debian/patches/add_CPGPLOT.patch
index 5ee603c..7133137 100644
--- a/debian/patches/add_CPGPLOT.patch
+++ b/debian/patches/add_CPGPLOT.patch
@@ -23,15 +23,6 @@ Description: Correct linker flags for pgsbox
  AC_SUBST([TSTDIRS])
 --- a/pgsbox/GNUmakefile
 +++ b/pgsbox/GNUmakefile
-@@ -117,7 +117,7 @@
- 	     cd tmp && \
- 	     trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
- 	     $(AR) x ../$(PICLIB) && \
--	     $(SHRLD) -o $@ *.o ../$(WCSSHR) $(LDFLAGS) $(PGPLOTLIB) $(FLIBS) && \
-+	     $(SHRLD) -o $@ *.o ../$(WCSSHR) $(LDFLAGS) $(PGPLOTLIB) $(CPGPLOTLIB) $(FLIBS) && \
- 	     mv $@ .. && \
- 	     ln -sf $@ ../$(SONAME) && \
- 	     ln -sf $(SONAME) ../$(SHRLN)
 @@ -192,7 +192,7 @@
  	-@ echo ''
  	   $(FC) -I../Fortran $(FFLAGS) -c fscan.f lngvel.f
diff --git a/debian/patches/dynlink.patch b/debian/patches/dynlink.patch
index adc3d4f..a9ed1e8 100644
--- a/debian/patches/dynlink.patch
+++ b/debian/patches/dynlink.patch
@@ -22,8 +22,9 @@ Description: Use dynamic linking for wcslib-tools instead of static
  	   $(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(CFITSIOINC) \
  	     $(CFLAGS) -c -o $@.o $<
 -	   $(LD) -o $@ $@.o $(GETWCSTAB) $(LDFLAGS) $(CFITSIOLIB) $(WCSLIB) \
+-	     $(FLIBS) $(LIBS)
 +	   $(LD) -o $@ $@.o $(GETWCSTAB) $(LDFLAGS) $(CFITSIOLIB) -L../C -lwcs \
- 	     $(FLIBS) $(LIBS)
++	     $(LIBS)
  	-@ $(RM) $@.o
  
 -wcsgrid : wcsgrid.c $(GETWCSTAB) $(PGSBOXLIB) $(WCSLIB)
@@ -34,7 +35,7 @@ Description: Use dynamic linking for wcslib-tools instead of static
 -	   $(LD) -o $@ $@.o $(GETWCSTAB) $(LDFLAGS) $(PGSBOXLIB) \
 -	     $(PGPLOTLIB) $(CFITSIOLIB) $(WCSLIB) $(FLIBS) $(LIBS)
 +	   $(LD) -o $@ $@.o $(GETWCSTAB) $(LDFLAGS) -L../pgsbox -lpgsbox \
-+	     $(CPGPLOTLIB) $(CFITSIOLIB) -L../C -lwcs $(FLIBS) $(LIBS)
++	     $(CPGPLOTLIB) $(CFITSIOLIB) -L../C -lwcs $(LIBS)
  	-@ $(RM) $@.o
  
  ../C/getwcstab.o :

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