Fix snap build
This commit is contained in:
parent
f30aabc365
commit
9e1d9eee4b
1 changed files with 11 additions and 8 deletions
|
@ -292,7 +292,7 @@ parts:
|
||||||
- patches
|
- patches
|
||||||
|
|
||||||
qt:
|
qt:
|
||||||
plugin: cmake
|
plugin: nil
|
||||||
build-environment:
|
build-environment:
|
||||||
- LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
|
- LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
|
||||||
build-packages:
|
build-packages:
|
||||||
|
@ -378,13 +378,6 @@ parts:
|
||||||
- zlib1g
|
- zlib1g
|
||||||
- mesa-vulkan-drivers
|
- mesa-vulkan-drivers
|
||||||
- xkb-data
|
- xkb-data
|
||||||
cmake-generator: Ninja
|
|
||||||
cmake-parameters:
|
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
|
||||||
- -DCMAKE_INSTALL_PREFIX=/usr
|
|
||||||
- -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
|
|
||||||
- -DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
|
|
||||||
- -DINPUT_openssl=linked
|
|
||||||
override-pull: |
|
override-pull: |
|
||||||
QT=6.8.0
|
QT=6.8.0
|
||||||
|
|
||||||
|
@ -396,6 +389,16 @@ parts:
|
||||||
cd ../qtwayland
|
cd ../qtwayland
|
||||||
find $CRAFT_STAGE/patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
|
find $CRAFT_STAGE/patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
|
||||||
cd ..
|
cd ..
|
||||||
|
override-build: |
|
||||||
|
cmake -GNinja -B $CRAFT_PART_BUILD \
|
||||||
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
|
-DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr \
|
||||||
|
-DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR \
|
||||||
|
-DINPUT_openssl=linked
|
||||||
|
|
||||||
|
cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
|
||||||
|
DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
|
||||||
prime:
|
prime:
|
||||||
- -./usr/bin
|
- -./usr/bin
|
||||||
- -./usr/doc
|
- -./usr/doc
|
||||||
|
|
Loading…
Reference in a new issue