From 57a7cdc08ccaffd6305ab358c59739cedfd27d10 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 24 Oct 2023 08:28:13 +0200 Subject: [PATCH 1/2] Use `LD_LIBRARY_PATH` Hoping that setting the `LD_LIBRARY_PATH` will ensure the correct glibc is used. And ensure that glibc is installed Contributes to CURA-11145 --- packaging/AppImage-builder/AppImageBuilder.yml.jinja | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/AppImage-builder/AppImageBuilder.yml.jinja b/packaging/AppImage-builder/AppImageBuilder.yml.jinja index 1cf321d7a5..fde58a8650 100644 --- a/packaging/AppImage-builder/AppImageBuilder.yml.jinja +++ b/packaging/AppImage-builder/AppImageBuilder.yml.jinja @@ -48,6 +48,7 @@ AppDir: main include: - xdg-desktop-portal-kde + - glibc-source - libgtk-3-0 - librsvg2-2 - librsvg2-common @@ -70,6 +71,7 @@ AppDir: runtime: env: APPDIR_LIBRARY_PATH: "$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders" + LD_LIBRARY_PATH: "$APPDIR:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders" PYTHONPATH: "$APPDIR" QT_PLUGIN_PATH: "$APPDIR/qt/plugins" QML2_IMPORT_PATH: "$APPDIR/qt/qml" From 888c9e4bead9d5746023535cdb2d9578572c519b Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 24 Oct 2023 09:22:45 +0200 Subject: [PATCH 2/2] Add runtime compat to `LD_LIBRARY_PATH` That file containst libstdc++.so Contributes to CURA-11145 --- packaging/AppImage-builder/AppImageBuilder.yml.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/AppImage-builder/AppImageBuilder.yml.jinja b/packaging/AppImage-builder/AppImageBuilder.yml.jinja index fde58a8650..992082e5c6 100644 --- a/packaging/AppImage-builder/AppImageBuilder.yml.jinja +++ b/packaging/AppImage-builder/AppImageBuilder.yml.jinja @@ -70,8 +70,8 @@ AppDir: - usr/share/doc/*/TODO.* runtime: env: - APPDIR_LIBRARY_PATH: "$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders" - LD_LIBRARY_PATH: "$APPDIR:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders" + APPDIR_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders" + LD_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders" PYTHONPATH: "$APPDIR" QT_PLUGIN_PATH: "$APPDIR/qt/plugins" QML2_IMPORT_PATH: "$APPDIR/qt/qml"