extension: remove extra kde-neon build envvars (#4193)

remove extra build environment variables that are causing build failures.
canonical · Jun 16, 2023 · df5476b · df5476b
1 parent d8930f1
commit df5476b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 97 deletions.
diff --git a/snapcraft/extensions/kde_neon.py b/snapcraft/extensions/kde_neon.py
@@ -177,36 +177,6 @@ def get_part_snippet(self) -> Dict[str, Any]:
                         ],
                     ),
                 },
-                {
-                    "LD_LIBRARY_PATH": prepend_to_env(
-                        "LD_LIBRARY_PATH",
-                        [
-                            f"/snap/{sdk_snap}/current/lib/$CRAFT_ARCH_TRIPLET",
-                            f"/snap/{sdk_snap}/current/usr/lib/$CRAFT_ARCH_TRIPLET",
-                            f"/snap/{sdk_snap}/current/usr/lib",
-                            f"/snap/{sdk_snap}/current/usr/lib/vala-current",
-                            f"/snap/{sdk_snap}/current/usr/lib/$CRAFT_ARCH_TRIPLET/pulseaudio",
-                        ],
-                    ),
-                },
-                {
-                    "PKG_CONFIG_PATH": prepend_to_env(
-                        "PKG_CONFIG_PATH",
-                        [
-                            f"/snap/{sdk_snap}/current/usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig",
-                            f"/snap/{sdk_snap}/current/usr/lib/pkgconfig",
-                            f"/snap/{sdk_snap}/current/usr/share/pkgconfig",
-                        ],
-                    ),
-                },
-                {
-                    "ACLOCAL_PATH": prepend_to_env(
-                        "ACLOCAL_PATH",
-                        [
-                            f"/snap/{sdk_snap}/current/usr/share/aclocal",
-                        ],
-                    ),
-                },
                 {
                     "SNAPCRAFT_CMAKE_ARGS": prepend_to_env(
                         "SNAPCRAFT_CMAKE_ARGS",

diff --git a/tests/unit/extensions/test_kde_neon.py b/tests/unit/extensions/test_kde_neon.py
@@ -181,40 +181,6 @@ def assert_get_part_snippet(kde_neon_instance):
                         "/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
                     )
                 },
-                {
-                    "LD_LIBRARY_PATH": ":".join(
-                        [
-                            "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                            "lib/$CRAFT_ARCH_TRIPLET",
-                            "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                            "usr/lib/$CRAFT_ARCH_TRIPLET",
-                            "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/usr/lib",
-                            "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                            "usr/lib/vala-current",
-                            "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                            "usr/lib/$CRAFT_ARCH_TRIPLET/pulseaudio",
-                        ]
-                    )
-                    + "${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-                },
-                {
-                    "PKG_CONFIG_PATH": (
-                        "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                        "usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:"
-                        "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                        "usr/lib/pkgconfig:"
-                        "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                        "usr/share/pkgconfig"
-                    )
-                    + "${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
-                },
-                {
-                    "ACLOCAL_PATH": (
-                        "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                        "usr/share/aclocal"
-                    )
-                    + "${ACLOCAL_PATH:+:$ACLOCAL_PATH}"
-                },
                 {
                     "SNAPCRAFT_CMAKE_ARGS": (
                         "-DCMAKE_FIND_ROOT_PATH="
@@ -241,39 +207,6 @@ def test_get_part_snippet_with_external_sdk(kde_neon_extension_with_build_snap):
                     "/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
                 )
             },
-            {
-                "LD_LIBRARY_PATH": ":".join(
-                    [
-                        "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                        "lib/$CRAFT_ARCH_TRIPLET",
-                        "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                        "usr/lib/$CRAFT_ARCH_TRIPLET",
-                        "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/usr/lib",
-                        "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                        "usr/lib/vala-current",
-                        "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                        "usr/lib/$CRAFT_ARCH_TRIPLET/pulseaudio",
-                    ]
-                )
-                + "${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-            },
-            {
-                "PKG_CONFIG_PATH": (
-                    "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                    "usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:"
-                    "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                    "usr/lib/pkgconfig:"
-                    "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
-                    "usr/share/pkgconfig"
-                )
-                + "${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
-            },
-            {
-                "ACLOCAL_PATH": (
-                    "/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/" "usr/share/aclocal"
-                )
-                + "${ACLOCAL_PATH:+:$ACLOCAL_PATH}"
-            },
             {
                 "SNAPCRAFT_CMAKE_ARGS": (
                     "-DCMAKE_FIND_ROOT_PATH="