Add libproxy to LD_LIBRARY_PATH as it can no longer find it's own libs.

canonical · Nov 26, 2024 · f7c209e · f7c209e
1 parent 3c90d77
commit f7c209e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/snapcraft/extensions/kde_neon_6.py b/snapcraft/extensions/kde_neon_6.py
@@ -292,6 +292,9 @@ def get_part_snippet(self, *, plugin_name: str) -> Dict[str, Any]:
                             # lapack
                             f"/snap/{kf6_sdk_snap}/current/usr/lib/"
                             "${CRAFT_ARCH_TRIPLET_BUILD_FOR}/lapack",
+                            # libproxy
+                            f"/snap/{kf6_sdk_snap}/current/usr/lib/"
+                            "${CRAFT_ARCH_TRIPLET_BUILD_FOR}/libproxy",
                             # kf6 libs
                             f"/snap/{kf6_sdk_snap}/current/usr/lib",
                             # Staged libs

diff --git a/tests/unit/extensions/test_kde_neon_6.py b/tests/unit/extensions/test_kde_neon_6.py
@@ -467,6 +467,8 @@ def assert_get_part_snippet(kde_neon_6_instance):
                         "/blas:"
                         "/snap/kf6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}"
                         "/lapack:"
+                        "/snap/kf6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}"
+                        "/libproxy:"
                         "/snap/kf6-core22-sdk/current/usr/lib:"
                         "$CRAFT_STAGE/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:"
                         "$CRAFT_STAGE/usr/lib:"
@@ -531,6 +533,7 @@ def test_get_part_snippet_with_external_sdk(kde_neon_6_extension_with_build_snap
                     "/snap/kf6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:"
                     "/snap/kf6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/blas:"
                     "/snap/kf6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/lapack:"
+                    "/snap/kf6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}              /libproxy:"
                     "/snap/kf6-core22-sdk/current/usr/lib:"
                     "$CRAFT_STAGE/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:"
                     "$CRAFT_STAGE/usr/lib:"
@@ -598,6 +601,8 @@ def assert_get_part_snippet(kde_neon_6_instance):
                     "/blas:"
                     "/snap/kf6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}"
                     "/lapack:"
+                    "/snap/kf6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}"
+                    "/libproxy:"
                     "/snap/kf6-core24-sdk/current/usr/lib:"
                     "$CRAFT_STAGE/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:"
                     "$CRAFT_STAGE/usr/lib:"