[neon/snap-packaging/kde-qt6-core-sdk/work.core24] /: A few env fixes to find python.
Scarlett Moore
null at kde.org
Mon Mar 17 13:38:12 GMT 2025
Git commit f6a438f1f0aa8d144b6f3012c0427f5209b80292 by Scarlett Moore.
Committed on 17/03/2025 at 13:37.
Pushed by scarlettmoore into branch 'work.core24'.
A few env fixes to find python.
M +5 -4 snapcraft.yaml
https://invent.kde.org/neon/snap-packaging/kde-qt6-core-sdk/-/commit/f6a438f1f0aa8d144b6f3012c0427f5209b80292
diff --git a/snapcraft.yaml b/snapcraft.yaml
index c9628c7..4b2ae56 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -291,15 +291,16 @@ parts:
- -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- --log-level=STATUS
- -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/snap/kf6-core24-sdk/current/usr"
- - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\:/snap/kde-qt6-core24-sdk/current\\:/snap/kf6-core24-sdk/current/usr"
+ - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE"
+ - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr"
build-environment: &buildenvironment
- PATH: /snap/kde-qt6-core24-sdk/current/usr/bin${PATH:+:$PATH}
- PKG_CONFIG_PATH: /snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
- XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kde-qt6-core24-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
- XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core24-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
- - LD_LIBRARY_PATH: "/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/libproxy:/snap/kde-qt6-core24-sdk/current/usr/lib:/snap/kf6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kf6-core24-sdk/current/usr/lib:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/lib/:$CRAFT_STAGE/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
- - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
+ - LD_LIBRARY_PATH: "$CRAFT_STAGE/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:$CRAFT_STAGE/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/libproxy:$CRAFT_STAGE/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+ - PYTHONPATH: ${CRAFT_STAGE}/usr/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
+ - C_INCLUDE_PATH: ${CRAFT_STAGE}/usr/include
debs:
after: [qt6]
plugin: nil
More information about the Neon-commits
mailing list