mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
[gha] refresh linux-snap.patch
Signed-off-by: Michał Sawicz <michal@sawicz.net>
This commit is contained in:
parent
c7242a37be
commit
ef0a6b7bee
1 changed files with 12 additions and 13 deletions
25
.github/workflows/linux-snap.patch
vendored
25
.github/workflows/linux-snap.patch
vendored
|
@ -1,38 +1,37 @@
|
|||
--- a/snap/snapcraft.yaml
|
||||
+++ b/snap/snapcraft.yaml
|
||||
@@ -32,6 +32,7 @@ parts:
|
||||
@@ -35,6 +35,7 @@ parts:
|
||||
googlemaps:
|
||||
source: git://github.com/Subsurface/googlemaps.git
|
||||
source: https://github.com/Subsurface/googlemaps.git
|
||||
build-packages:
|
||||
+ - ccache
|
||||
- wget
|
||||
override-pull: |
|
||||
snapcraftctl pull
|
||||
@@ -75,6 +76,8 @@ parts:
|
||||
@@ -78,6 +79,7 @@ parts:
|
||||
plugin: qmake
|
||||
options:
|
||||
qmake-parameters:
|
||||
- INCLUDEPATH+=QtHeaders
|
||||
+ - QMAKE_CC=ccache gcc
|
||||
+ - QMAKE_CXX=ccache g++
|
||||
+ - CONFIG+=ccache
|
||||
|
||||
desktop-qt5:
|
||||
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
|
||||
@@ -105,7 +108,11 @@ parts:
|
||||
@@ -108,7 +110,11 @@ parts:
|
||||
source: .
|
||||
source-type: git
|
||||
source-subdir: libdivecomputer
|
||||
+ configflags:
|
||||
+ - CC=ccache gcc
|
||||
+ - CXX=ccache g++
|
||||
+ autotools-configure-parameters:
|
||||
+ - CC="ccache gcc"
|
||||
+ - CXX="ccache g++"
|
||||
build-packages:
|
||||
+ - ccache
|
||||
- libbluetooth-dev
|
||||
- libhidapi-dev
|
||||
- libusb-dev
|
||||
@@ -127,9 +134,12 @@ parts:
|
||||
- -DLIBGIT2_DYNAMIC=ON
|
||||
@@ -131,9 +137,12 @@ parts:
|
||||
- -DFTDISUPPORT=ON
|
||||
- -DLIBDIVECOMPUTER_LIBRARIES=../../../stage/lib/libdivecomputer.so
|
||||
- -DLIBDIVECOMPUTER_LIBRARIES=../../../stage/usr/local/lib/libdivecomputer.so
|
||||
- -DLIBDIVECOMPUTER_INCLUDE_DIR=../../../stage/usr/local/include
|
||||
+ - -DCMAKE_C_COMPILER_LAUNCHER=ccache
|
||||
+ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
|
||||
source-type: git
|
||||
|
|
Loading…
Reference in a new issue