diff options
Diffstat (limited to 'meta/recipes-core/zlib/zlib-1.2.8')
4 files changed, 0 insertions, 105 deletions
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch b/meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch deleted file mode 100644 index 61eea8238a..0000000000 --- a/meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Add 'ptest' target to Makefile, to run tests without checking dependencies. | ||
2 | |||
3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | ||
4 | Upstream-Status: Pending | ||
5 | --- | ||
6 | diff -uNr a/Makefile.in b/Makefile.in | ||
7 | --- a/Makefile.in 2013-06-10 13:48:14.321959162 +0200 | ||
8 | +++ b/Makefile.in 2013-06-10 13:49:36.686476448 +0200 | ||
9 | @@ -83,6 +83,9 @@ | ||
10 | test: all teststatic testshared | ||
11 | |||
12 | teststatic: static | ||
13 | + @make runteststatic | ||
14 | + | ||
15 | +runteststatic: | ||
16 | @TMPST=tmpst_$$; \ | ||
17 | if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \ | ||
18 | echo ' *** zlib test OK ***'; \ | ||
19 | @@ -92,6 +95,9 @@ | ||
20 | rm -f $$TMPST | ||
21 | |||
22 | testshared: shared | ||
23 | + @make runtestshared | ||
24 | + | ||
25 | +runtestshared: | ||
26 | @LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ | ||
27 | LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \ | ||
28 | DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \ | ||
29 | @@ -105,6 +111,9 @@ | ||
30 | rm -f $$TMPSH | ||
31 | |||
32 | test64: all64 | ||
33 | + @make runtestall64 | ||
34 | + | ||
35 | +runtestall64: | ||
36 | @TMP64=tmp64_$$; \ | ||
37 | if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \ | ||
38 | echo ' *** zlib 64-bit test OK ***'; \ | ||
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch b/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch deleted file mode 100644 index 19c40b7452..0000000000 --- a/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | Obey LDFLAGS for tests | ||
2 | |||
3 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
4 | Upstream-Status: Pending | ||
5 | |||
6 | --- zlib-1.2.8.orig/Makefile.in | ||
7 | +++ zlib-1.2.8/Makefile.in | ||
8 | @@ -26,7 +26,7 @@ CFLAGS=-O | ||
9 | |||
10 | SFLAGS=-O | ||
11 | LDFLAGS= | ||
12 | -TEST_LDFLAGS=-L. libz.a | ||
13 | +TEST_LDFLAGS=-L. $(LDFLAGS) | ||
14 | LDSHARED=$(CC) | ||
15 | CPP=$(CC) -E | ||
16 | |||
17 | @@ -176,22 +176,22 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz. | ||
18 | -@rmdir objs | ||
19 | |||
20 | example$(EXE): example.o $(STATICLIB) | ||
21 | - $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) | ||
22 | + $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(STATICLIB) | ||
23 | |||
24 | minigzip$(EXE): minigzip.o $(STATICLIB) | ||
25 | - $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) | ||
26 | + $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(STATICLIB) | ||
27 | |||
28 | examplesh$(EXE): example.o $(SHAREDLIBV) | ||
29 | - $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV) | ||
30 | + $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(SHAREDLIBV) | ||
31 | |||
32 | minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) | ||
33 | - $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV) | ||
34 | + $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(SHAREDLIBV) | ||
35 | |||
36 | example64$(EXE): example64.o $(STATICLIB) | ||
37 | - $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) | ||
38 | + $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) $(STATICLIB) | ||
39 | |||
40 | minigzip64$(EXE): minigzip64.o $(STATICLIB) | ||
41 | - $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) | ||
42 | + $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) $(STATICLIB) | ||
43 | |||
44 | install-libs: $(LIBS) | ||
45 | -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi | ||
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch deleted file mode 100644 index 403b4825c9..0000000000 --- a/meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | |||
2 | When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache | ||
3 | (in my case libstdc++.so cannot be found after building zlib(-native) and I have to call | ||
4 | touch */libstdc++.so && /sbin/ldconfig to fix it. | ||
5 | |||
6 | So remove ldconfig call from make install-libs | ||
7 | |||
8 | Upstream-Status: Inappropriate [disable feature] | ||
9 | |||
10 | diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in | ||
11 | --- zlib-1.2.6.orig/Makefile.in 2012-01-28 23:48:50.000000000 +0100 | ||
12 | +++ zlib-1.2.6/Makefile.in 2012-02-13 15:38:20.577700723 +0100 | ||
13 | @@ -199,7 +199,6 @@ | ||
14 | rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ | ||
15 | ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \ | ||
16 | ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ | ||
17 | - ($(LDCONFIG) || true) >/dev/null 2>&1; \ | ||
18 | fi | ||
19 | cp zlib.3 $(DESTDIR)$(man3dir) | ||
20 | chmod 644 $(DESTDIR)$(man3dir)/zlib.3 | ||
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/run-ptest b/meta/recipes-core/zlib/zlib-1.2.8/run-ptest deleted file mode 100644 index 884d9dc699..0000000000 --- a/meta/recipes-core/zlib/zlib-1.2.8/run-ptest +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | make -k runteststatic runtestshared | sed -r -e 's/^(\s+\*+ (.+?) test OK \*+)/\1\nPASS: \2/' -e 's/^(\s+\*+ (.+?) test FAILED \*+)/\1\nFAIL: \2/' | ||