From 7dfae65ce9511debb52cb2bb0303bab76012db47 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 11 Feb 2017 12:14:33 -0800 Subject: Make zlib's 'make check' actually fail if test fails Upstream: https://github.com/madler/zlib/pull/225 Signed-off-by: Alexey Neyman diff --git a/patches/zlib/1.2.11/100-make-check-fail.patch b/patches/zlib/1.2.11/100-make-check-fail.patch new file mode 100644 index 0000000..3852206 --- /dev/null +++ b/patches/zlib/1.2.11/100-make-check-fail.patch @@ -0,0 +1,33 @@ +'make check' should return with non-zero status + +... if the test fails. + +--- zlib-1.2.11/Makefile.in.orig 2017-02-11 12:00:37.768094420 -0800 ++++ zlib-1.2.11/Makefile.in 2017-02-11 12:01:02.088399001 -0800 +@@ -91,7 +91,7 @@ + echo ' *** zlib test OK ***'; \ + else \ + echo ' *** zlib test FAILED ***'; false; \ +- fi; \ ++ fi + rm -f $$TMPST + + testshared: shared +@@ -104,7 +104,7 @@ + echo ' *** zlib shared test OK ***'; \ + else \ + echo ' *** zlib shared test FAILED ***'; false; \ +- fi; \ ++ fi + rm -f $$TMPSH + + test64: all64 +@@ -113,7 +113,7 @@ + echo ' *** zlib 64-bit test OK ***'; \ + else \ + echo ' *** zlib 64-bit test FAILED ***'; false; \ +- fi; \ ++ fi + rm -f $$TMP64 + + infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h -- cgit v0.10.2-6-g49f6 From c8e82815331803bce45eb8f90b790dd235025259 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 11 Feb 2017 12:49:48 -0800 Subject: Skip comp.libs checking on host for canadian ... they all want to run the binaries they produced, which fails when build!=host. Signed-off-by: Alexey Neyman diff --git a/scripts/build/companion_libs/050-zlib.sh b/scripts/build/companion_libs/050-zlib.sh index 45518e9..6e17819 100644 --- a/scripts/build/companion_libs/050-zlib.sh +++ b/scripts/build/companion_libs/050-zlib.sh @@ -97,8 +97,13 @@ do_zlib_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking zlib" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking zlib" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for zlib on the host" + fi fi CT_DoLog EXTRA "Installing zlib" diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh index 6b526c8..c81874a 100644 --- a/scripts/build/companion_libs/100-gmp.sh +++ b/scripts/build/companion_libs/100-gmp.sh @@ -106,8 +106,13 @@ do_gmp_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking GMP" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking GMP" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for GMP on the host" + fi fi CT_DoLog EXTRA "Installing GMP" diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh index 4b9bc64..a7b7f72 100644 --- a/scripts/build/companion_libs/110-mpfr.sh +++ b/scripts/build/companion_libs/110-mpfr.sh @@ -149,8 +149,13 @@ do_mpfr_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking MPFR" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking MPFR" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for MPFR on the host" + fi fi CT_DoLog EXTRA "Installing MPFR" diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh index 8783f2d..ef93bbd 100644 --- a/scripts/build/companion_libs/121-isl.sh +++ b/scripts/build/companion_libs/121-isl.sh @@ -115,8 +115,13 @@ do_isl_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking ISL" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking ISL" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for ISL on the host" + fi fi CT_DoLog EXTRA "Installing ISL" diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh index b6ea1e5..b21b028 100644 --- a/scripts/build/companion_libs/130-cloog.sh +++ b/scripts/build/companion_libs/130-cloog.sh @@ -112,8 +112,13 @@ do_cloog_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking CLooG" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking CLooG" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for CLooG on the host" + fi fi CT_DoLog EXTRA "Installing CLooG" diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh index acb5fd3..e6efb4f 100644 --- a/scripts/build/companion_libs/140-mpc.sh +++ b/scripts/build/companion_libs/140-mpc.sh @@ -100,8 +100,13 @@ do_mpc_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking MPC" - CT_DoExecLog ALL make ${JOBSFLAGS} -s check + if [ "${host}" = "${CT_BUILD}" ]; then + CT_DoLog EXTRA "Checking MPC" + CT_DoExecLog ALL make ${JOBSFLAGS} -s check + else + # Cannot run host binaries on build in a canadian cross + CT_DoLog EXTRA "Skipping check for MPC on the host" + fi fi CT_DoLog EXTRA "Installing MPC" -- cgit v0.10.2-6-g49f6