summaryrefslogtreecommitdiff
path: root/Meta
diff options
context:
space:
mode:
authorDaniel Bertalan <dani@danielbertalan.dev>2022-03-27 21:07:04 +0200
committerBrian Gianforcaro <b.gianfo@gmail.com>2022-03-27 12:17:59 -0700
commit66582a875fd4494bfffeb6b59628ee52114f707e (patch)
treeced38f6913c194c11781bdc176c8e4d067547636 /Meta
parent192f4b0258b04197a3aba5eaa2cbedb34dce672c (diff)
downloadserenity-66582a875fd4494bfffeb6b59628ee52114f707e.zip
Meta: Specify -z when decompressing tar.gz archives
While GNU tar automatically detects the used compression algorithm, POSIX requires that we specify -z if the tarball is compressed with gzip. Fixes a build error on OpenBSD.
Diffstat (limited to 'Meta')
-rw-r--r--Meta/CMake/time_zone_data.cmake2
-rw-r--r--Meta/CMake/wasm_spec_tests.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/Meta/CMake/time_zone_data.cmake b/Meta/CMake/time_zone_data.cmake
index f60ce486cd..f6a183a9fc 100644
--- a/Meta/CMake/time_zone_data.cmake
+++ b/Meta/CMake/time_zone_data.cmake
@@ -41,7 +41,7 @@ set(TZDB_ZONE_1970_PATH "${TZDB_PATH}/${TZDB_ZONE_1970_SOURCE}")
function(extract_tzdb_file source path)
if(EXISTS "${TZDB_ZIP_PATH}" AND NOT EXISTS "${path}")
message(STATUS "Extracting TZDB ${source} from ${TZDB_ZIP_PATH}...")
- execute_process(COMMAND "${TAR_TOOL}" -C "${TZDB_PATH}" -xf "${TZDB_ZIP_PATH}" "${source}" RESULT_VARIABLE tar_result)
+ execute_process(COMMAND "${TAR_TOOL}" -C "${TZDB_PATH}" -xzf "${TZDB_ZIP_PATH}" "${source}" RESULT_VARIABLE tar_result)
if (NOT tar_result EQUAL 0)
message(FATAL_ERROR "Failed to unzip ${source} from ${TZDB_ZIP_PATH} with status ${tar_result}")
endif()
diff --git a/Meta/CMake/wasm_spec_tests.cmake b/Meta/CMake/wasm_spec_tests.cmake
index 17c9110e71..578167bc28 100644
--- a/Meta/CMake/wasm_spec_tests.cmake
+++ b/Meta/CMake/wasm_spec_tests.cmake
@@ -23,7 +23,7 @@ if(INCLUDE_WASM_SPEC_TESTS)
message(STATUS "Extracting the WebAssembly testsuite from ${WASM_SPEC_TEST_GZ_PATH}...")
file(MAKE_DIRECTORY ${WASM_SPEC_TEST_PATH})
execute_process(COMMAND "${GZIP_TOOL}" -k -d ${WASM_SPEC_TEST_GZ_PATH})
- execute_process(COMMAND "${TAR_TOOL}" -xf ${WASM_SPEC_TEST_TAR_PATH})
+ execute_process(COMMAND "${TAR_TOOL}" -xzf ${WASM_SPEC_TEST_TAR_PATH})
execute_process(COMMAND rm ${WASM_SPEC_TEST_TAR_PATH})
file(GLOB WASM_TESTS "${CMAKE_BINARY_DIR}/testsuite-main/*.wast")
foreach(PATH ${WASM_TESTS})