From b1f7fa094d49d92edf29466db956c47466a41e32 Mon Sep 17 00:00:00 2001 From: Zach Bjornson Date: Wed, 19 Jun 2024 12:50:18 -0700 Subject: [PATCH] use pax-utils package instead of building --- prebuild/Linux/bundle.sh | 4 ++-- prebuild/Linux/preinstall.sh | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/prebuild/Linux/bundle.sh b/prebuild/Linux/bundle.sh index 78c8929fe..414292edc 100644 --- a/prebuild/Linux/bundle.sh +++ b/prebuild/Linux/bundle.sh @@ -1,8 +1,8 @@ set -ex -copies=$(lddtree.sh -l build/Release/canvas.node | sed -r -e '/^\/lib/d' -e '/canvas.node$/d'); +apt install -y patchelf pax-utils -apt install -y patchelf +copies=$(lddtree.sh -l build/Release/canvas.node | sed -r -e '/^\/lib/d' -e '/canvas.node$/d'); for so in $copies; do cp $so build/Release diff --git a/prebuild/Linux/preinstall.sh b/prebuild/Linux/preinstall.sh index 57bbc571c..1c96b3997 100644 --- a/prebuild/Linux/preinstall.sh +++ b/prebuild/Linux/preinstall.sh @@ -1,14 +1,3 @@ # apt-get-style dependencies aren't done here since the # linux build is done on a docker image that has them -# ... except for libseccomp, which could go in the docker image, but for now I -# don't want to rebuild it. -apt-get install -y libseccomp2 libseccomp-dev - -git clone git://anongit.gentoo.org/proj/pax-utils.git -cd pax-utils -# the last commit before they changed from make to meson -git checkout d9f65269d7182ef1d313e3b87bcea37e45958561 -PATH=$PATH:$PWD -make -cd ..