external_deps: use xz instead of bz2 on linux and macos archives

DaemonEngine · Sep 23, 2022 · d5d8fa7 · d5d8fa7
1 parent 2fda9c0
commit d5d8fa7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -222,10 +222,10 @@ elseif (WIN32)
         set(DEPS_DIR ${EXTERNAL_DEPS_DIR}/mingw32-${DEPS_VERSION})
     endif()
 elseif (APPLE)
-    set(DEPS_EXT ".tar.bz2")
+    set(DEPS_EXT ".tar.xz")
     set(DEPS_DIR ${EXTERNAL_DEPS_DIR}/macosx64-${DEPS_VERSION})
 elseif (LINUX)
-    set(DEPS_EXT ".tar.bz2")
+    set(DEPS_EXT ".tar.xz")
     # Our minimal NaCl .debs put the files in /usr/lib/nacl, so check that first
     if (EXISTS "/usr/lib/nacl/nacl_loader")
         set(DEPS_DIR "/usr/lib/nacl")

diff --git a/external_deps/build.sh b/external_deps/build.sh
@@ -628,8 +628,9 @@ build_package() {
 		zip -r "${PLATFORM}-${DEPS_VERSION}.zip" "${PLATFORM}-${DEPS_VERSION}"
 		;;
 	*)
-		rm -f "${PLATFORM}-${DEPS_VERSION}.tar.bz2"
-		tar cvjf "${PLATFORM}-${DEPS_VERSION}.tar.bz2" "${PLATFORM}-${DEPS_VERSION}"
+		export XZ_OPT='-9'
+		rm -f "${PLATFORM}-${DEPS_VERSION}.tar.xz"
+		tar cvJf "${PLATFORM}-${DEPS_VERSION}.tar.xz" "${PLATFORM}-${DEPS_VERSION}"
 		;;
 	esac
 }