[neon/snap-packaging/kde-qt6-core-sdk/work.core24] /: Also fix up libdir and includedir in pkgconfig files

Kevin Ottens null at kde.org
Fri Nov 15 08:53:27 GMT 2024


Git commit bb9b39bd4adbb6faa887fa6f8c7aa9e1077e975f by Kevin Ottens.
Committed on 15/11/2024 at 08:53.
Pushed by ervin into branch 'work.core24'.

Also fix up libdir and includedir in pkgconfig files

Some of them are not using variables properly so replace their /usr to
something which points inside of the snap.

M  +2    -0    snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 0992bbd..502e578 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -391,6 +391,8 @@ parts:
     override-stage: |
         craftctl default
         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=/snap/$CRAFT_PROJECT_NAME/current/usr:g' {}*" \;
+        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:includedir=/usr:includedir=/snap/$CRAFT_PROJECT_NAME/current/usr:g' {}*" \;
 
   cleanup:
     plugin: nil


More information about the Neon-commits mailing list