[Debian-astro-commits] [funtools] 01/06: Let failing mklibs fail the build

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository funtools.

commit fc8d9c232f443fa1500913587cf407ca92dcbfc6
Author: Ole Streicher <ole at aip.de>
Date:   Wed Nov 22 10:05:25 2017 +0100

    Let failing mklibs fail the build
    
    Closes: #882357
---
 .../Let-failing-mklibs-fail-the-build.patch        | 66 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 67 insertions(+)

diff --git a/debian/patches/Let-failing-mklibs-fail-the-build.patch b/debian/patches/Let-failing-mklibs-fail-the-build.patch
new file mode 100644
index 0000000..36bba89
--- /dev/null
+++ b/debian/patches/Let-failing-mklibs-fail-the-build.patch
@@ -0,0 +1,66 @@
+From: Ole Streicher <ole at aip.de>
+Date: Wed, 22 Nov 2017 10:04:33 +0100
+Subject: Let failing mklibs fail the build
+
+Closes: #882357
+---
+ Makefile.in | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 52862fb..48f6f0b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -230,11 +230,11 @@ funmainlib.c:	$(MAINLIBOBJS) mkfunmainlib
+ 		echo $(PROGS) | ./mkfunmainlib > funmainlib.c;
+ 
+ shlib:		sublib $(LIBOBJS)
+-		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+-		(cd $(PACKAGE)tmp && ar x ../$(LIB)); \
++		rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp
++		(cd $(PACKAGE)tmp && ar x ../$(LIB))
+ 		CC='$(CC)' CXX=$(CXX) \
+-		./mklib -o $(PACKAGE) -ldl $(WCS_LIBS) -lm -lz `LC_ALL=C ls $(PACKAGE)tmp/*.o`; \
+-		rm -rf $(PACKAGE)tmp;)
++		./mklib -o $(PACKAGE) -ldl $(WCS_LIBS) -lm -lz `LC_ALL=C ls $(PACKAGE)tmp/*.o`
++		rm -rf $(PACKAGE)tmp
+ 
+ mainlib:	$(MAINLIBOBJS) funmainlib.o lex.calc.o
+ 		@(ar cruv lib$(PACKAGE)MainLib.a \
+@@ -242,26 +242,26 @@ mainlib:	$(MAINLIBOBJS) funmainlib.o lex.calc.o
+ 		$(RANLIB) lib$(PACKAGE)MainLib.a)
+ 
+ shmainlib:	mainlib
+-		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+-		(cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \
++		rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp
++		(cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a)
+ 		CC='$(CC)' CXX='$(CXX)' \
+-		./mklib -o $(PACKAGE)MainLib -L. -lfuntools `LC_ALL=C ls $(PACKAGE)tmp/*.o`;\
+-		rm -rf $(PACKAGE)tmp;)
++		./mklib -o $(PACKAGE)MainLib -L. -lfuntools `LC_ALL=C ls $(PACKAGE)tmp/*.o`
++		rm -rf $(PACKAGE)tmp
+ 
+ tclfun:		$(LIB) tclmainlib.o tclfun.o
+ 		@(ar cruv libtclfun.a tclmainlib.o tclfun.o; \
+ 		$(RANLIB) libtclfun.a)
+ 
+ shtclfun:	tclfun
+-		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+-		(cd $(PACKAGE)tmp && ar x ../libtclfun.a); \
++		rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp
++		(cd $(PACKAGE)tmp && ar x ../libtclfun.a)
+ 		CC='$(CC)' CXX='$(CXX)' \
+-		./mklib -o tclfun -L. -lfuntools `LC_ALL=C ls $(PACKAGE)tmp/*.o` $(TCL_LIBS); \
+-		rm -rf $(PACKAGE)tmp; \
+-		test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \
++		./mklib -o tclfun -L. -lfuntools `LC_ALL=C ls $(PACKAGE)tmp/*.o` $(TCL_LIBS)
++		rm -rf $(PACKAGE)tmp
++		test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old
+ 		SHLIB=libtclfun.so; \
+ 		test -r libtclfun.dylib && SHLIB=libtclfun.dylib; \
+-		echo "pkg_mkIndex -direct . $${SHLIB}; exit" | tclsh;)
++		echo "pkg_mkIndex -direct . $${SHLIB}; exit" | tclsh
+ 
+ tclfun.c:	FORCE
+ 		echo $(PROGS) | ./mkfunmainlib -tcl > tclfun.c
diff --git a/debian/patches/series b/debian/patches/series
index 8dbeae1..39913b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Build-the-Tcl-extension-as-a-shared-library.patch
 Copy-files-to-the-correct-destinations-according-to-multi.patch
 Sort-object-files.patch
 Fix-missing-template-in-AC_DEFINE.patch
+Let-failing-mklibs-fail-the-build.patch

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