Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kde-neon-extension: remove extra build environment variables that are… #4193

Merged
merged 8 commits into from
Jun 16, 2023
Merged

kde-neon-extension: remove extra build environment variables that are… #4193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
966dca3
kde-neon-extension: remove extra build environment variables that are…
ScarlettGatelyMoore Jun 2, 2023
1aa0509
Merge branch 'main' into sgmoore/update_neon_ext_build_env
ScarlettGatelyMoore Jun 2, 2023
0360b3c
Merge branch 'main' into sgmoore/update_neon_ext_build_env
ScarlettGatelyMoore Jun 5, 2023
7a5294d
Merge branch 'main' into sgmoore/update_neon_ext_build_env
ScarlettGatelyMoore Jun 7, 2023
8cea88d
Merge branch 'main' into sgmoore/update_neon_ext_build_env
ScarlettGatelyMoore Jun 8, 2023
9cf35aa
Merge branch 'main' into sgmoore/update_neon_ext_build_env
ScarlettGatelyMoore Jun 8, 2023
142b7c0
Merge branch 'main' into sgmoore/update_neon_ext_build_env
ScarlettGatelyMoore Jun 13, 2023
238bcc6
Merge branch 'main' into sgmoore/update_neon_ext_build_env
mr-cal Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions snapcraft/extensions/kde_neon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
67 changes: 0 additions & 67 deletions tests/unit/extensions/test_kde_neon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="
Expand All @@ -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="
Expand Down