From c85feea1a5a042145a00a004484822a23bf0ad88 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Tue, 16 Jun 2020 12:02:05 +0200 Subject: [PATCH] using pathcelf instead of chrpath --- .github/workflows/BuildAndRelease.yml | 2 +- .github/workflows/BuildUbuntu.yml | 2 +- install/linux/linux_appimages.sh | 2 +- install/linux/linux_deploy.sh | 2 +- install/linux/linux_setup_env_ubuntu.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml index 5130fecff..51cc520a6 100644 --- a/.github/workflows/BuildAndRelease.yml +++ b/.github/workflows/BuildAndRelease.yml @@ -56,7 +56,7 @@ jobs: - name: Install dependencies run: | sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev - sudo apt-get install -y libxkbcommon-x11-0 chrpath + sudo apt-get install -y libxkbcommon-x11-0 chrpath patchelf - name: Setup env variables id: envs run: | diff --git a/.github/workflows/BuildUbuntu.yml b/.github/workflows/BuildUbuntu.yml index de90a1a29..ab571e0f8 100644 --- a/.github/workflows/BuildUbuntu.yml +++ b/.github/workflows/BuildUbuntu.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies run: | sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev - sudo apt-get install -y libxkbcommon-x11-0 chrpath + sudo apt-get install -y libxkbcommon-x11-0 chrpath patchelf - name: Setup env variables id: envs run: | diff --git a/install/linux/linux_appimages.sh b/install/linux/linux_appimages.sh index 9b8914b83..f20286b5e 100644 --- a/install/linux/linux_appimages.sh +++ b/install/linux/linux_appimages.sh @@ -39,7 +39,7 @@ $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab.desktop -ap mv *.AppImage ../MeshLab$VERSION-linux.AppImage chmod +x ../MeshLab$VERSION-linux.AppImage -chrpath -r '$ORIGIN/usr/lib:$ORIGIN/usr/lib/meshlab' AppRun +patchelf --set-rpath '$ORIGIN/usr/lib:$ORIGIN/usr/lib/meshlab' AppRun chmod +x usr/bin/meshlab chmod +x usr/bin/meshlabserver diff --git a/install/linux/linux_deploy.sh b/install/linux/linux_deploy.sh index a8f8a8e0b..b9ed8ad03 100644 --- a/install/linux/linux_deploy.sh +++ b/install/linux/linux_deploy.sh @@ -24,7 +24,7 @@ cd $DISTRIB_PATH $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab.desktop -bundle-non-qt-libs -executable=usr/bin/meshlabserver -chrpath -r '$ORIGIN/usr/lib:$ORIGIN/usr/lib/meshlab' AppRun +patchelf --set-rpath '$ORIGIN/usr/lib:$ORIGIN/usr/lib/meshlab' AppRun chmod +x usr/bin/meshlab chmod +x usr/bin/meshlabserver diff --git a/install/linux/linux_setup_env_ubuntu.sh b/install/linux/linux_setup_env_ubuntu.sh index 94ef311bd..d13a25dc2 100644 --- a/install/linux/linux_setup_env_ubuntu.sh +++ b/install/linux/linux_setup_env_ubuntu.sh @@ -5,5 +5,5 @@ # Run this script if you never installed any of the MeshLab dependencies. sudo apt-get update -sudo apt-get install -y qt5-default qttools5-dev-tools qtdeclarative5-dev libqt5xmlpatterns5-dev mesa-common-dev libglu1-mesa-dev lib3ds-dev libglew-dev libeigen3-dev libopenctm-dev libgmp-dev libqhull-dev #libmuparser-dev +sudo apt-get install -y qt5-default qttools5-dev-tools qtdeclarative5-dev libqt5xmlpatterns5-dev mesa-common-dev libglu1-mesa-dev lib3ds-dev libglew-dev libeigen3-dev libopenctm-dev libgmp-dev libqhull-dev patchelf chrpath #libmuparser-dev sudo apt-get install -y chrpath