aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patches/zlib/1.2.11/100-make-check-fail.patch33
-rw-r--r--scripts/build/companion_libs/050-zlib.sh9
-rw-r--r--scripts/build/companion_libs/100-gmp.sh9
-rw-r--r--scripts/build/companion_libs/110-mpfr.sh9
-rw-r--r--scripts/build/companion_libs/121-isl.sh9
-rw-r--r--scripts/build/companion_libs/130-cloog.sh9
-rw-r--r--scripts/build/companion_libs/140-mpc.sh9
7 files changed, 75 insertions, 12 deletions
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 00000000..38522063
--- /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
diff --git a/scripts/build/companion_libs/050-zlib.sh b/scripts/build/companion_libs/050-zlib.sh
index 45518e9e..6e17819e 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 6b526c80..c81874a8 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 4b9bc64a..a7b7f729 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 8783f2db..ef93bbd6 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 b6ea1e58..b21b028c 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 acb5fd3f..e6efb4f7 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"
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-18 10:16:01 +0000