Skip to content

Commit 9bd75c8

Browse files
committed
Use patchelf
1 parent a8dfd1c commit 9bd75c8

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

.circleci/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ jobs:
4040
- run: |
4141
mkdir -p ~/artifacts
4242
node -p "require('./package').version" > ~/artifacts/pkg-version
43-
43+
44+
- run: sudo apt-get update -qq
45+
- run: sudo apt-get install -qq patchelf
4446
- run: chmod +x src/qt-mkdir.sh && src/qt-mkdir.sh ~/qt_tmp
4547
- run: chmod +x src/qt-copy-linux.sh && src/qt-copy-linux.sh ~/qt_tmp ~/Qt/6.8.0/gcc_arm64
4648
- run: cd ~/qt_tmp && tar -czf ../aarch64.gz *

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ jobs:
8787
- name: Copy Qt Dir - Linux
8888
if: matrix.os == 'ubuntu-22.04'
8989
run: |
90+
sudo apt-get update -qq
91+
sudo apt-get install -qq patchelf
9092
echo "OS_NAME=linux" >> $GITHUB_ENV
9193
chmod +x src/qt-copy-linux.sh
9294
src/qt-copy-linux.sh ${{ env.QT_TMP }} ${{ github.workspace }}/../Qt/6.8.0/gcc_64

src/fix-rpath.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/qt-copy-linux.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,36 @@ cp $2/lib/libQt6OpenGL.so.6 $1/libQt6OpenGL.so.6
77
cp $2/lib/libQt6Svg.so.6 $1/libQt6Svg.so.6
88
cp $2/lib/libQt6Widgets.so.6 $1/libQt6Widgets.so.6
99
cp $2/lib/libQt6XcbQpa.so.6 $1/libQt6XcbQpa.so.6
10+
cp $2/lib/libQt6WaylandClient.so.6 $1/libQt6WaylandClient.so.6
11+
cp $2/lib/libQt6WaylandEglClientHwIntegration.so.6 $1/libQt6WaylandEglClientHwIntegration.so.6
1012

1113

12-
chrpath -r '$$ORIGIN/../..' $1/plugins/iconengines/libqsvgicon.so
14+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/iconengines/libqsvgicon.so
1315
cp $2/plugins/iconengines/libqsvgicon.so $1/plugins/iconengines/libqsvgicon.so
1416

15-
chrpath -r '$$ORIGIN/../..' $1/plugins/imageformats/libqgif.so
17+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/imageformats/libqgif.so
1618
cp $2/plugins/imageformats/libqgif.so $1/plugins/imageformats/libqgif.so
1719

18-
chrpath -r '$$ORIGIN/../..' $1/plugins/imageformats/libqico.so
20+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/imageformats/libqico.so
1921
cp $2/plugins/imageformats/libqico.so $1/plugins/imageformats/libqico.so
2022

21-
chrpath -r '$$ORIGIN/../..' $1/plugins/imageformats/libqjpeg.so
23+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/imageformats/libqjpeg.so
2224
cp $2/plugins/imageformats/libqjpeg.so $1/plugins/imageformats/libqjpeg.so
2325

24-
chrpath -r '$$ORIGIN/../..' $1/plugins/imageformats/libqsvg.so
26+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/imageformats/libqsvg.so
2527
cp $2/plugins/imageformats/libqsvg.so $1/plugins/imageformats/libqsvg.so
2628

27-
chrpath -r '$$ORIGIN/../..' $1/plugins/platforms/libqlinuxfb.so
29+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/platforms/libqlinuxfb.so
2830
cp $2/plugins/platforms/libqlinuxfb.so $1/plugins/platforms/libqlinuxfb.so
2931

30-
chrpath -r '$$ORIGIN/../..' $1/plugins/platforms/libqoffscreen.so
32+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/platforms/libqoffscreen.so
3133
cp $2/plugins/platforms/libqoffscreen.so $1/plugins/platforms/libqoffscreen.so
3234

33-
chrpath -r '$$ORIGIN/../..' $1/plugins/platforms/libqwayland-generic.so
35+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/platforms/libqwayland-generic.so
3436
cp $2/plugins/platforms/libqwayland-generic.so $1/plugins/platforms/libqwayland-generic.so
3537

36-
chrpath -r '$$ORIGIN/../..' $1/plugins/platforms/libqwayland-egl.so
38+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/platforms/libqwayland-egl.so
3739
cp $2/plugins/platforms/libqwayland-egl.so $1/plugins/platforms/libqwayland-egl.so
3840

39-
chrpath -r '$$ORIGIN/../..' $1/plugins/platforms/libqxcb.so
41+
patchelf --force-rpath --set-rpath '$$ORIGIN/../..' $1/plugins/platforms/libqxcb.so
4042
cp $2/plugins/platforms/libqxcb.so $1/plugins/platforms/libqxcb.so

0 commit comments

Comments
 (0)