Add PKG_COMPRESSION support

Also, add PKG_TAGS to win and macos build scripts.
edgedb · Oct 16, 2024 · ad94045 · ad94045
1 parent f2ede08
commit ad94045
Show file tree

Hide file tree

Showing 20 changed files with 88 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -81,6 +81,10 @@ ifneq ($(PKG_INSTALL_REF),)
 	EXTRAENV += -e PKG_INSTALL_REF="$(PKG_INSTALL_REF)"
 endif
 
+ifneq ($(PKG_COMPRESSION),)
+	EXTRAENV += -e PKG_COMPRESSION="$(PKG_COMPRESSION)"
+endif
+
 ifneq ($(EXTRA_OPTIMIZATIONS),)
 	EXTRAENV += -e EXTRA_OPTIMIZATIONS=true
 endif

diff --git a/integration/linux/build/centos-7/Dockerfile b/integration/linux/build/centos-7/Dockerfile
diff --git a/integration/linux/build/centos-8/Dockerfile b/integration/linux/build/centos-8/Dockerfile
diff --git a/integration/linux/build/debian-bookworm/Dockerfile b/integration/linux/build/debian-bookworm/Dockerfile
diff --git a/integration/linux/build/debian-bullseye/Dockerfile b/integration/linux/build/debian-bullseye/Dockerfile
diff --git a/integration/linux/build/debian-buster/Dockerfile b/integration/linux/build/debian-buster/Dockerfile
diff --git a/integration/linux/build/entrypoint.sh b/integration/linux/build/entrypoint.sh
@@ -35,6 +35,10 @@ if [ -n "${PKG_TAGS}" ]; then
     extraopts+=" --pkg-tags=${PKG_TAGS}"
 fi
 
+if [ -n "${PKG_COMPRESSION}" ]; then
+    extraopts+=" --pkg-compression=${PKG_COMPRESSION}"
+fi
+
 if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then
     extraopts+=" --extra-optimizations"
 fi

diff --git a/integration/linux/build/fedora-40/Dockerfile b/integration/linux/build/fedora-40/Dockerfile
@@ -96,6 +96,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\
     extraopts+=" --pkg-tags=${PKG_TAGS}"\n\
 fi\n\
 \n\
+if [ -n "${PKG_COMPRESSION}" ]; then\n\
+    extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\
+fi\n\
+\n\
 if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\
     extraopts+=" --extra-optimizations"\n\
 fi\n\

diff --git a/integration/linux/build/linux-aarch64/Dockerfile b/integration/linux/build/linux-aarch64/Dockerfile
diff --git a/integration/linux/build/linux-x86_64/Dockerfile b/integration/linux/build/linux-x86_64/Dockerfile
diff --git a/integration/linux/build/linuxmusl-aarch64/Dockerfile b/integration/linux/build/linuxmusl-aarch64/Dockerfile
diff --git a/integration/linux/build/linuxmusl-x86_64/Dockerfile b/integration/linux/build/linuxmusl-x86_64/Dockerfile
diff --git a/integration/linux/build/rockylinux-9/Dockerfile b/integration/linux/build/rockylinux-9/Dockerfile
diff --git a/integration/linux/build/ubuntu-bionic/Dockerfile b/integration/linux/build/ubuntu-bionic/Dockerfile
diff --git a/integration/linux/build/ubuntu-focal/Dockerfile b/integration/linux/build/ubuntu-focal/Dockerfile
diff --git a/integration/linux/build/ubuntu-hirsute/Dockerfile b/integration/linux/build/ubuntu-hirsute/Dockerfile
diff --git a/integration/linux/build/ubuntu-jammy/Dockerfile b/integration/linux/build/ubuntu-jammy/Dockerfile
diff --git a/integration/linux/build/ubuntu-noble/Dockerfile b/integration/linux/build/ubuntu-noble/Dockerfile
diff --git a/integration/macos/build.sh b/integration/macos/build.sh
@@ -25,6 +25,14 @@ if [ -n "${PKG_SUBDIST}" ]; then
     extraopts+=" --pkg-subdist=${PKG_SUBDIST}"
 fi
 
+if [ -n "${PKG_TAGS}" ]; then
+    extraopts+=" --pkg-tags=${PKG_TAGS}"
+fi
+
+if [ -n "${PKG_COMPRESSION}" ]; then
+    extraopts+=" --pkg-compression=${PKG_COMPRESSION}"
+fi
+
 if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then
     extraopts+=" --extra-optimizations"
 fi

diff --git a/integration/win/build.sh b/integration/win/build.sh
@@ -32,6 +32,14 @@ if [ -n "${PKG_SUBDIST}" ]; then
     extraopts+=" --pkg-subdist=${PKG_SUBDIST}"
 fi
 
+if [ -n "${PKG_TAGS}" ]; then
+    extraopts+=" --pkg-tags=${PKG_TAGS}"
+fi
+
+if [ -n "${PKG_COMPRESSION}" ]; then
+    extraopts+=" --pkg-compression=${PKG_COMPRESSION}"
+fi
+
 if [ -n "${BUILD_GENERIC}" ]; then
     extraopts+=" --generic"
 fi