[SCM] Minimal buy-in FITS library and utility package branch, master, updated. 39ecd841bb5ab7ef2f010b72daadc40869161035

Ole Streicher debian at liska.ath.cx
Fri Feb 3 14:35:54 UTC 2012


The following commit has been merged in the master branch:
commit 39ecd841bb5ab7ef2f010b72daadc40869161035
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 3 15:35:22 2012 +0100

    Don't include all objects into the tcl library; link to the shlib instead.

diff --git a/debian/patches/build_tclfun.patch b/debian/patches/build_tclfun.patch
index 2e14ca1..4bf69c7 100644
--- a/debian/patches/build_tclfun.patch
+++ b/debian/patches/build_tclfun.patch
@@ -21,6 +21,18 @@
  
  # extra libs
  EXTRA_LIBS =		@EXTRA_LIBS@
+@@ -253,9 +253,9 @@ tclfun:		$(LIB) tclmainlib.o tclfun.o
+ 
+ shtclfun:	tclfun
+ 		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+-		(cd $(PACKAGE)tmp && ar x ../$(LIB) && ar x ../libtclfun.a); \
++		(cd $(PACKAGE)tmp && ar x ../libtclfun.a); \
+ 		CC='$(CC)' CXX='$(CXX)' \
+-		./mklib -o tclfun $(PACKAGE)tmp/*.o; \
++		./mklib -o tclfun -L. -lfuntools $(PACKAGE)tmp/*.o; \
+ 		rm -rf $(PACKAGE)tmp; \
+ 		test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \
+ 		SHLIB=libtclfun.so; \
 @@ -396,6 +397,8 @@ install::	install-man
  
  install::	install-share

-- 
Minimal buy-in FITS library and utility package



More information about the debian-science-commits mailing list