[Debian-astro-commits] [xpa] 01/03: Recognise the exit status of mklibs

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository xpa.

commit 30a79e23a39583e8676fa9a4a0b2cda17aa1860f
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Aug 9 13:30:54 2017 +0200

    Recognise the exit status of mklibs
    
    Closes: #871509
---
 .../Recognise-the-exit-status-of-mklibs.patch      | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/Recognise-the-exit-status-of-mklibs.patch b/debian/patches/Recognise-the-exit-status-of-mklibs.patch
new file mode 100644
index 0000000..9a25a2a
--- /dev/null
+++ b/debian/patches/Recognise-the-exit-status-of-mklibs.patch
@@ -0,0 +1,33 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 9 Aug 2017 13:29:31 +0200
+Subject: Recognise the exit status of mklibs
+
+This is required to correctly fail if mklibs exits with error.
+
+Closes: #871509
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index edb1a91..8b599cb 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -185,7 +185,7 @@ shlib:		$(LIB)
+ 		rm -f lib$(PACKAGE).tmp/xt*.o; \
+ 		rm -f lib$(PACKAGE).tmp/tcl*.o; \
+ 		CC='$(CC)' CXX=$(CXX) \
+-		./mklib -ldflags "$(LDFLAGS)" -o $(PACKAGE) `LC_ALL=C ls lib$(PACKAGE).tmp/*.o`; \
++		./mklib -ldflags "$(LDFLAGS)" -o $(PACKAGE) `LC_ALL=C ls lib$(PACKAGE).tmp/*.o`&& \
+ 		rm -rf lib$(PACKAGE).tmp)
+ 
+ mingw-dll:	$(LIBOBJS)
+@@ -204,7 +204,7 @@ shtclxpa:	tclxpa
+ 		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ 		(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
+ 		CC='$(CC)' CXX='$(CXX)' \
+-		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa `LC_ALL=C ls $(PACKAGE)tmp/*.o` -ltclstub; \
++		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa `LC_ALL=C ls $(PACKAGE)tmp/*.o` -ltclstub && \
+ 		rm -rf $(PACKAGE)tmp; )
+ 
+ diff:
diff --git a/debian/patches/series b/debian/patches/series
index c473c22..84eee0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Add-a-description-to-AC_DEFINEs.patch
 Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch
 Add-hardening-flags.patch
 Sort-.o-files.patch
+Recognise-the-exit-status-of-mklibs.patch

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