summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/zlib/zlib/Makefile-runtests.patch38
-rw-r--r--meta/recipes-core/zlib/zlib/run-ptest7
-rw-r--r--meta/recipes-core/zlib/zlib_1.2.11.bb16
3 files changed, 7 insertions, 54 deletions
diff --git a/meta/recipes-core/zlib/zlib/Makefile-runtests.patch b/meta/recipes-core/zlib/zlib/Makefile-runtests.patch
deleted file mode 100644
index 61eea8238a..0000000000
--- a/meta/recipes-core/zlib/zlib/Makefile-runtests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Add 'ptest' target to Makefile, to run tests without checking dependencies.
2
3Signed-off-by: Anders Roxell <anders.roxell@enea.com>
4Upstream-Status: Pending
5---
6diff -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/run-ptest b/meta/recipes-core/zlib/zlib/run-ptest
index 884d9dc699..065863ef75 100644
--- a/meta/recipes-core/zlib/zlib/run-ptest
+++ b/meta/recipes-core/zlib/zlib/run-ptest
@@ -1,2 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2make -k runteststatic runtestshared | sed -r -e 's/^(\s+\*+ (.+?) test OK \*+)/\1\nPASS: \2/' -e 's/^(\s+\*+ (.+?) test FAILED \*+)/\1\nFAIL: \2/' 2
3if ./examplesh ; then
4 echo "PASS: zlib"
5else
6 echo "FAIL: zlib"
7fi
diff --git a/meta/recipes-core/zlib/zlib_1.2.11.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb
index 41ec29d95e..ef9431ae47 100644
--- a/meta/recipes-core/zlib/zlib_1.2.11.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.11.bb
@@ -7,7 +7,6 @@ LICENSE = "Zlib"
7LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0" 7LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0"
8 8
9SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ 9SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
10 file://Makefile-runtests.patch \
11 file://ldflags-tests.patch \ 10 file://ldflags-tests.patch \
12 file://run-ptest \ 11 file://run-ptest \
13 " 12 "
@@ -30,25 +29,12 @@ do_compile() {
30 oe_runmake shared 29 oe_runmake shared
31} 30}
32 31
33do_compile_ptest() {
34 oe_runmake test
35}
36
37do_install() { 32do_install() {
38 oe_runmake DESTDIR=${D} install 33 oe_runmake DESTDIR=${D} install
39} 34}
40 35
41do_install_ptest() { 36do_install_ptest() {
42 install ${B}/Makefile ${D}${PTEST_PATH} 37 install ${B}/examplesh ${D}${PTEST_PATH}
43 install ${B}/example ${D}${PTEST_PATH}
44 install ${B}/minigzip ${D}${PTEST_PATH}
45 install ${B}/examplesh ${D}${PTEST_PATH}
46 install ${B}/minigzipsh ${D}${PTEST_PATH}
47
48 # Remove buildhost references...
49 sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
50 -e 's|${DEBUG_PREFIX_MAP}||g' \
51 ${D}${PTEST_PATH}/Makefile
52} 38}
53 39
54# Move zlib shared libraries for target builds to $base_libdir so the library 40# Move zlib shared libraries for target builds to $base_libdir so the library