Merge branch 'master' into ol8-and-ol9-updates

cupermir · Jun 17, 2024 · 88295a7 · 88295a7
2 parents 57d5b38 + a87bf7f
commit 88295a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/packages/mold/2.32.0/chksum b/packages/mold/2.32.0/chksum
@@ -0,0 +1,4 @@
+md5 v2.32.0.tar.gz a6d222dacd30f0c11546a2194f737280
+sha1 v2.32.0.tar.gz 3a0f23d8ea365df0f783205f1a58b9a69b653a9e
+sha256 v2.32.0.tar.gz 4b7e4146ea0f52be9adae8b417399f3676a041e65b55e3f25f088120d30a320b
+sha512 v2.32.0.tar.gz 66cd95ec65b31749ead7604f921eebd9f8e7faad82f6aa2cd7a179e4f4cb2bd78584ec5a8de000fbd4c37bbbfeb878e40a4e93ca909d1be557d73117e4b38f4b
diff --git a/packages/mold/2.32.0/version.desc b/packages/mold/2.32.0/version.desc
diff --git a/scripts/build/companion_libs/070-zstd.sh b/scripts/build/companion_libs/070-zstd.sh
@@ -81,19 +81,9 @@ do_zstd_backend() {
     done
 
     CT_DoLog EXTRA "Building zstd"
-    CT_DoExecLog ALL make ${CT_JOBSFLAGS} -C "${CT_SRC_DIR}/zstd/lib" libzstd.a BUILD_DIR="${PWD}" CC="${host}-gcc" AS="${host}-as" CFLAGS="${cflags}" LDFLAGS="${ldflags}"
-
-    # TODO: Has to be tested
-
-    #if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then
-    #    if [ "${host}" = "${CT_BUILD}" ]; then
-    #        CT_DoLog EXTRA "Checking zstd"
-    #        CT_DoExecLog ALL make ${CT_JOBSFLAGS} -s check
-    #    else
-    #        # Cannot run host binaries on build in a canadian cross
-    #        CT_DoLog EXTRA "Skipping check for zstd on the host"
-    #    fi
-    #fi
+    CT_DoExecLog ALL make ${CT_JOBSFLAGS} -C "${CT_SRC_DIR}/zstd/lib" libzstd.a-mt-release BUILD_DIR="${PWD}" CC="${host}-gcc" AS="${host}-as" CFLAGS="${cflags}" LDFLAGS="${ldflags}"
+
+    # There is no library only check in zstd
 
     CT_DoLog EXTRA "Installing zstd"
     CT_DoExecLog ALL make -C "${CT_SRC_DIR}/zstd/lib" install-static install-includes BUILD_DIR="${PWD}" PREFIX="$prefix"