[neon/snap-packaging/kde-qt6-core-sdk] /: Prefix again..

Scarlett Moore null at kde.org
Fri May 31 13:37:13 BST 2024


Git commit 8ca462a5034cae6c0a17774e8ea376a5833c01d2 by Scarlett Moore.
Committed on 31/05/2024 at 12:36.
Pushed by scarlettmoore into branch 'master'.

Prefix again..

M  +5    -8    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-qt6-core-sdk/-/commit/8ca462a5034cae6c0a17774e8ea376a5833c01d2

diff --git a/snapcraft.yaml b/snapcraft.yaml
index ce8c4f4..8ce8296 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -366,14 +366,11 @@ parts:
       lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR: usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
     override-stage: |
         craftctl default
-        for PC in $(find $CRAFT_STAGE -type f,l -name "*.pc")
-        do
-          -exec bash -c "sed -i 's:/root/stage:/snap/$CRAFT_PROJECT_NAME/current:g' $PC" \;
-          -exec bash -c "sed -i 's|libdir=/usr|libdir=${prefix}|g' $PC" \;
-          -exec bash -c "sed -i 's|includedir=/usr|includedir=${prefix}|g' $PC" \;
-          -exec bash -c "sed -i 's|exec_prefix=/usr|exec_prefix=${prefix}|g' $PC" \;
-          -exec bash -c "sed -i 's|modlibexecdir=/usr|modlibexecdir=${prefix}|g' $PC" \;
-        done
+        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:/root/stage:/snap/$CRAFT_PROJECT_NAME/current:g' {}*" \;
+        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's|libdir=/usr|libdir=${prefix}|g' {}*" \;
+        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's|includedir=/usr|includedir=${prefix}|g' {}*" \;
+        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's|exec_prefix=/usr|exec_prefix=${prefix}|g' {}*" \;
+        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's|modlibexecdir=/usr|modlibexecdir=${prefix}|g' {}*" ;
     prime:
       - -etc
       - -lib


More information about the Neon-commits mailing list