[Debian-astro-commits] [wcslib] 01/03: Use dynamic linking for wcslib-tools instead of static

[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 6e8ac1c70266740e6e748535f52e1617e8d38aa4
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Jun 20 17:06:58 2016 +0200

    Use dynamic linking for wcslib-tools instead of static
---
 debian/changelog             |  6 +++
 debian/patches/dynlink.patch | 95 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 102 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c037150..ef44822 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wcslib (5.15-2) UNRELEASED; urgency=low
+
+  * Use dynamic linking for wcslib-tools instead of static
+
+ -- Ole Streicher <olebole at debian.org>  Sat, 18 Jun 2016 15:16:41 +0200
+
 wcslib (5.15-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/dynlink.patch b/debian/patches/dynlink.patch
new file mode 100644
index 0000000..9cbe470
--- /dev/null
+++ b/debian/patches/dynlink.patch
@@ -0,0 +1,95 @@
+--- a/utils/GNUmakefile
++++ b/utils/GNUmakefile
+@@ -38,9 +38,6 @@
+ 
+ MAN := $(addsuffix .1,$(UTILS))
+ 
+-WCSLIB    := ../C/$(WCSLIB)
+-PGSBOXLIB := ../pgsbox/libpgsbox-$(LIBVER).a
+-
+ ifneq "$(GETWCSTAB)" ""
+   GETWCSTAB := ../C/$(GETWCSTAB)
+ endif
+@@ -70,20 +67,20 @@
+ 	   $(LD) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS)
+ 	-@ $(RM) $@.o
+ 
+-wcsware : wcsware.c $(GETWCSTAB) $(WCSLIB)
++wcsware : wcsware.c $(GETWCSTAB) ../C/$(WCSLIB)
+ 	-@ echo ''
+ 	   $(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(CFITSIOINC) \
+ 	     $(CFLAGS) -c -o $@.o $<
+-	   $(LD) -o $@ $@.o $(GETWCSTAB) $(LDFLAGS) $(CFITSIOLIB) $(WCSLIB) \
++	   $(LD) -o $@ $@.o $(GETWCSTAB) $(LDFLAGS) $(CFITSIOLIB) -L../C -lwcs \
+ 	     $(FLIBS) $(LIBS)
+ 	-@ $(RM) $@.o
+ 
+-wcsgrid : wcsgrid.c $(GETWCSTAB) $(PGSBOXLIB) $(WCSLIB)
++wcsgrid : wcsgrid.c $(GETWCSTAB) ../pgsbox/libpgsbox-$(LIBVER).a ../C/$(WCSLIB)
+ 	-@ echo ''
+ 	   $(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(PGPLOTINC) \
+ 	     $(CFITSIOINC) $(CFLAGS) -c -o $@.o $<
+-	   $(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)
+ 	-@ $(RM) $@.o
+ 
+ ../C/getwcstab.o :
+@@ -102,7 +99,7 @@
+ 	-@ echo ''
+ 	   $(MAKE) -C ../pgsbox lib
+ 
+-$(WCSLIB) :
++../C/$(WCSLIB) :
+ 	-@ echo ''
+ 	   $(MAKE) -C ../C lib
+ 
+--- a/C/GNUmakefile
++++ b/C/GNUmakefile
+@@ -246,7 +246,9 @@
+ 	     trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
+ 	     $(AR) x ../$(PICLIB) && \
+ 	     $(SHRLD) -o $@ *.o $(LDFLAGS) $(LIBS) && \
+-	     mv $@ ..
++	     mv $@ .. && \
++	     ln -sf $@ ../$(SONAME) && \
++	     ln -sf $(SONAME) ../$(SHRLN)
+ 
+ $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
+ 
+--- a/pgsbox/GNUmakefile
++++ b/pgsbox/GNUmakefile
+@@ -118,7 +118,9 @@
+ 	     trap 'cd .. ; $(RM) -r tmp' 0 1 2 3 15 ; \
+ 	     $(AR) x ../$(PICLIB) && \
+ 	     $(SHRLD) -o $@ *.o ../$(WCSSHR) $(LDFLAGS) $(PGPLOTLIB) $(FLIBS) && \
+-	     mv $@ ..
++	     mv $@ .. && \
++	     ln -sf $@ ../$(SONAME) && \
++	     ln -sf $(SONAME) ../$(SHRLN)
+ 
+ $(PICLIB) : $(MODULES:%.o=$(PICLIB)(%.o)) ;
+ 
+--- a/C/test/tdis3
++++ b/C/test/tdis3
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+ 
++  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:.
++  export LD_LIBRARY_PATH
++
+   echo "Testing WCSLIB's handling of translated distortions (tdis3)"
+   echo "-----------------------------------------------------------"
+ 
+--- a/C/test/twcslint
++++ b/C/test/twcslint
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+ 
++  LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:.
++  export LD_LIBRARY_PATH
++
+   exec 1>twcslint.out 2>&1
+ 
+   echo "Testing WCSLIB syntax checker for FITS WCS keyrecords (twcslint)"
diff --git a/debian/patches/series b/debian/patches/series
index 2ffb5c6..8840233 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+dynlink.patch
 increase_tspx_test_tol.patch
 disable_Ftspx_test.patch

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