[neon/snap-packaging/kde-qt5-core-sdk] /: Fix snap name, arch triplet env name.
Scarlett Moore
null at kde.org
Wed Oct 9 10:20:58 BST 2024
Git commit 3280901d7925716a9611b23372c6f1d49c713b06 by Scarlett Moore.
Committed on 09/10/2024 at 09:20.
Pushed by scarlettmoore into branch 'master'.
Fix snap name, arch triplet env name.
M +151 -151 snapcraft.yaml
https://invent.kde.org/neon/snap-packaging/kde-qt5-core-sdk/-/commit/3280901d7925716a9611b23372c6f1d49c713b06
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2598f3e..4512125 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,8 +1,8 @@
---
-name: qt-5-15-10-sdk
-version: 5.15.10
+name: kde-qt5-core22-sdk
+version: 5.15.15
base: core22
-summary: Shared Qt 5.15.10 with the KDE patch set
+summary: Shared Qt 5.15.15 with the KDE patch set
description: |
This snap contains the necessary libraries required by
Qt Applications.
@@ -51,30 +51,30 @@ parts:
source: https://invent.kde.org/qt/qt/qtbase.git
source-branch: kde/5.15
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
./configure \
-prefix /usr \
-bindir /usr/lib/qt5/bin \
- -libdir /usr/lib/$CRAFT_ARCH_TRIPLET \
+ -libdir /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR \
-docdir /usr/share/qt5/doc \
- -headerdir /usr/include/$CRAFT_ARCH_TRIPLET/qt5 \
+ -headerdir /usr/include/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5 \
-datadir /usr/share/qt5 \
- -archdatadir /usr/lib/$CRAFT_ARCH_TRIPLET/qt5 \
- -plugindir /usr/lib/$CRAFT_ARCH_TRIPLET/qt5/plugins \
- -importdir /usr/lib/$CRAFT_ARCH_TRIPLET/qt5/imports \
+ -archdatadir /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5 \
+ -plugindir /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/plugins \
+ -importdir /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/imports \
-translationdir /usr/share/qt5/translations \
- -hostdatadir /usr/lib/$CRAFT_ARCH_TRIPLET/qt5 \
+ -hostdatadir /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5 \
-sysconfdir /etc/xdg \
- -examplesdir /usr/lib/$CRAFT_ARCH_TRIPLET/qt5/examples \
+ -examplesdir /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/examples \
-release \
-opensource \
-confirm-license \
-nomake examples \
-nomake tests \
-I $CRAFT_STAGE/usr/include \
- -L $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET
+ -L $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL" install
@@ -191,10 +191,10 @@ parts:
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -207,18 +207,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtxmlpatterns/build/.git
rm -rf $CRAFT_STAGE/../parts/qtxmlpatterns/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtx11extras:
after: [ qtbase ]
source: https://invent.kde.org/qt/qt/qtx11extras.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -238,18 +238,18 @@ parts:
- libxcb-glx0-dev
- libxcb-sync0-dev
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtgamepad:
after: [ qtbase ]
source: https://invent.kde.org/qt/qt/qtgamepad.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -262,18 +262,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtgamepad/build/.git
rm -rf $CRAFT_STAGE/../parts/qtgamepad/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtimageformats:
after: [ qtbase ]
source: https://invent.kde.org/qt/qt/qtimageformats.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -286,8 +286,8 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtimageformats/build/.git
rm -rf $CRAFT_STAGE/../parts/qtimageformats/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
build-packages:
- libtiff5-dev
- libmng-dev
@@ -300,10 +300,10 @@ parts:
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -316,18 +316,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtnetworkauth/build/.git
rm -rf $CRAFT_STAGE/../parts/qtnetworkauth/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtserialport:
after: [ qtbase ]
source: https://invent.kde.org/qt/qt/qtserialport.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -340,18 +340,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtserialport/build/.git
rm -rf $CRAFT_STAGE/../parts/qtserialport/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtremoteobjects:
after: [ qtbase ]
source: https://invent.kde.org/qt/qt/qtremoteobjects.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -364,18 +364,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtremoteobjects/build/.git
rm -rf $CRAFT_STAGE/../parts/qtremoteobjects/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtsvg:
after: [ qtbase ]
source: https://invent.kde.org/qt/qt/qtsvg.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -388,18 +388,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtsvg/build/.git
rm -rf $CRAFT_STAGE/../parts/qtsvg/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtscript:
after: [ qtbase ]
source: https://invent.kde.org/qt/qt/qtscript.git
source-tag: 5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -412,18 +412,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtscript/build/.git
rm -rf $CRAFT_STAGE/../parts/qtscript/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtdeclarative:
after: [ qtxmlpatterns ]
source: https://invent.kde.org/qt/qt/qtdeclarative.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -436,18 +436,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtdeclarative/build/.git
rm -rf $CRAFT_STAGE/../parts/qtdeclarative/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtwayland:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtwayland.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -460,8 +460,8 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtwayland/build/.git
rm -rf $CRAFT_STAGE/../parts/qtwayland/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qttools:
after:
- qtdeclarative
@@ -473,10 +473,10 @@ parts:
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -489,8 +489,8 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qttools/build/.git
rm -rf $CRAFT_STAGE/../parts/qttools/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
stage-packages:
- libclang1-15
- libllvm15
@@ -500,10 +500,10 @@ parts:
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -516,8 +516,8 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtconnectivity/build/.git
rm -rf $CRAFT_STAGE/../parts/qtconnectivity/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
build-packages:
- libbluetooth-dev
stage-packages:
@@ -528,10 +528,10 @@ parts:
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -544,8 +544,8 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtcharts/build/.git
rm -rf $CRAFT_STAGE/../parts/qtcharts/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtdoc:
after:
- qtdeclarative
@@ -559,11 +559,11 @@ parts:
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
- QT_INSTALL_DOCS: $CRAFT_PART_INSTALL/usr/share/qt5/doc
override-build: |
- # $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ # $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
#$CRAFT_STAGE/usr/lib/qt5/bin/qmake -query
$CRAFT_STAGE/usr/lib/qt5/bin/qmake
make -j$CRAFT_PARALLEL_BUILD_COUNT docs
@@ -577,18 +577,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtdoc/build/.git
rm -rf $CRAFT_STAGE/../parts/qtdoc/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtlottie:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtlottie.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -601,18 +601,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtlottie/build/.git
rm -rf $CRAFT_STAGE/../parts/qtlottie/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtgraphicaleffects:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtgraphicaleffects.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -625,18 +625,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtgraphicaleffects/build/.git
rm -rf $CRAFT_STAGE/../parts/qtgraphicaleffects/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtmultimedia:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtmultimedia.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -650,12 +650,12 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtmultimedia/src/.git
stage:
# remove ffmpeg libs as they come from ffmpeg part
- - -usr/lib/$CRAFT_ARCH_TRIPLET/libavcodec.so.58*
- - -usr/lib/$CRAFT_ARCH_TRIPLET/libavutil.so.56*
- - -usr/lib/$CRAFT_ARCH_TRIPLET/libswresample.so.3*
+ - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libavcodec.so.58*
+ - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libavutil.so.56*
+ - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libswresample.so.3*
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
build-packages:
- libgstreamer1.0-dev
- libgstreamer-plugins-base1.0-dev
@@ -671,10 +671,10 @@ parts:
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -687,18 +687,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtquick3d/build/.git
rm -rf $CRAFT_STAGE/../parts/qtquick3d/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtquickcontrols:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtquickcontrols.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -711,18 +711,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtquickcontrols/build/.git
rm -rf $CRAFT_STAGE/../parts/qtquickcontrols/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtscxml:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtscxml.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -735,18 +735,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtscxml/build/.git
rm -rf $CRAFT_STAGE/../parts/qtscxml/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtquicktimeline:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtquicktimeline.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -759,18 +759,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtquicktimeline/build/.git
rm -rf $CRAFT_STAGE/../parts/qtquicktimeline/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtsensors:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtsensors.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -783,18 +783,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtsensors/build/.git
rm -rf $CRAFT_STAGE/../parts/qtsensors/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtwebchannel:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtwebchannel.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -807,18 +807,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtwebchannel/build/.git
rm -rf $CRAFT_STAGE/../parts/qtwebchannel/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtwebsockets:
after: [ qtdeclarative ]
source: https://invent.kde.org/qt/qt/qtwebsockets.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -831,18 +831,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtwebsockets/build/.git
rm -rf $CRAFT_STAGE/../parts/qtwebsockets/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qt3d:
after: [ qtdeclarative, qtimageformats ]
source: https://invent.kde.org/qt/qt/qt3d.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -855,18 +855,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qt3d/build/.git
rm -rf $CRAFT_STAGE/../parts/qt3d/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtquickcontrols2:
after: [ qtdeclarative, qtquickcontrols ]
source: https://invent.kde.org/qt/qt/qtquickcontrols2.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -879,18 +879,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtquickcontrols2/build/.git
rm -rf $CRAFT_STAGE/../parts/qtquickcontrols2/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtlocation:
after: [ qtquickcontrols, qtserialport ]
source: https://invent.kde.org/qt/qt/qtlocation.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -905,18 +905,18 @@ parts:
build-packages:
- libgeoclue-2-dev
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtdatavis3d:
after: [ qtmultimedia ]
source: https://invent.kde.org/qt/qt/qtdatavis3d.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -929,18 +929,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtdatavis3d/build/.git
rm -rf $CRAFT_STAGE/../parts/qtdatavis3d/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtspeech:
after: [ qtmultimedia ]
source: https://invent.kde.org/qt/qt/qtspeech.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -953,18 +953,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtspeech/build/.git
rm -rf $CRAFT_STAGE/../parts/qtspeech/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtserialbus:
after: [ qtserialport ]
source: https://invent.kde.org/qt/qt/qtserialbus.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -977,18 +977,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtserialbus/build/.git
rm -rf $CRAFT_STAGE/../parts/qtserialbus/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qttranslations:
after: [ qttools ]
source: https://invent.kde.org/qt/qt/qttranslations.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -1001,18 +1001,18 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qttranslations/build/.git
rm -rf $CRAFT_STAGE/../parts/qttranslations/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtwebglplugin:
after: [ qtwebsockets ]
source: https://invent.kde.org/qt/qt/qtwebglplugin.git
source-branch: kde/5.15
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
@@ -1025,14 +1025,14 @@ parts:
rm -rf $CRAFT_STAGE/../parts/qtwebglplugin/build/.git
rm -rf $CRAFT_STAGE/../parts/qtwebglplugin/src/.git
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
qtwebengine:
source: https://invent.kde.org/qt/qt/qtwebengine.git
source-tag: v5.15.17-lts
plugin: nil
build-environment:
- - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
override-build: |
# Setting number of build jobs to a safe number to prevent running out of memory during QtWebengine build
@@ -1040,14 +1040,14 @@ parts:
roundedmem=$(python3 -c "print(round($memtotal/1024000.0))")
maxcoresformem=$(python3 -c "print(max(1, int(($roundedmem / 2)-2)))")
numcoreslow=$(python3 -c "print(min($maxcoresformem, $CRAFT_PARALLEL_BUILD_COUNT))")
- $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qt.conf"
+ $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
make -j$CRAFT_PARALLEL_BUILD_COUNT
make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
rm -r "$CRAFT_PART_INSTALL/tmp"
prime:
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.la
- - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.prl
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+ - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
stage-packages:
- libnspr4
- libnss3
More information about the Neon-commits
mailing list