1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From: Ole Streicher <ole@aip.de>
Date: Wed, 22 Nov 2017 10:04:33 +0100
Subject: Let failing mklibs fail the build
Closes: #882357
---
Makefile.in | 28 ++++++++++++++--------------
mklib | 1 +
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 21e3f8a..2f41ae4 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 -p $(PACKAGE)tmp; \
- (cd $(PACKAGE)tmp && ar x ../$(LIB)); \
+ rm -rf $(PACKAGE)tmp; mkdir -p $(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 -p $(PACKAGE)tmp; \
- (cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \
+ rm -rf $(PACKAGE)tmp; mkdir -p $(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 -p $(PACKAGE)tmp; \
- (cd $(PACKAGE)tmp && ar x ../libtclfun.a); \
+ rm -rf $(PACKAGE)tmp; mkdir -p $(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/mklib b/mklib
index 2f99336..8e47a27 100755
--- a/mklib
+++ b/mklib
@@ -24,6 +24,7 @@
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+set -e
#
# Option defaults
|
