github-wownero/wowlet
1
0
Fork 0
mirror of https://github.com/wownero/wowlet.git synced 2026-10-17 07:11:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

depends(libxkbcommon): explicit xkb extension paths for cross + cache restore-keys

Browse Source 
libxkbcommon 1.13.1 meson.build adds empty pkgconfig vars when xkeyboard-config is absent from the cross sysroot (XKEYBOARD_CONFIG_ROOT='') while has_extensions_directories is true -> meson hard-errors at pkgconfig.generate. Pass non-empty -Dxkb-config-(un)versioned-extensions-path.

Add restore-keys to all 4 depends cache restores: a busted exact key (any packages/* edit) now falls back to the newest prefix match, so make resumes from the partial built tree instead of rebuilding the static-Qt6 toolchain from scratch.
This commit is contained in:
jwinterm
2026-06-21 15:09:15 -04:00
parent 82bb6460a7
commit 57531a9d09
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+8
View File
@@ -166,12 +166,16 @@ jobs:
with: with:
path: contrib/depends/sources path: contrib/depends/sources
key: depends-sources-${{ hashFiles('contrib/depends/packages/*') }} key: depends-sources-${{ hashFiles('contrib/depends/packages/*') }}
restore-keys: |
depends-sources-
- name: restore depends built cache (mingw) - name: restore depends built cache (mingw)
id: cache-built id: cache-built
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
with: with:
path: contrib/depends/built path: contrib/depends/built
key: depends-built-mingw32-${{ hashFiles('contrib/depends/packages/*', 'contrib/depends/hosts/*', 'contrib/depends/toolchain.cmake.in') }} key: depends-built-mingw32-${{ hashFiles('contrib/depends/packages/*', 'contrib/depends/hosts/*', 'contrib/depends/toolchain.cmake.in') }}
restore-keys: |
depends-built-mingw32-
- name: build depends (static Qt6 + tor + boost + openssl for mingw) - name: build depends (static Qt6 + tor + boost + openssl for mingw)
# -j2 not -j(nproc): the parallel static Qt6 compile OOMs the 16G runner at -j4. Slower but safe. # -j2 not -j(nproc): the parallel static Qt6 compile OOMs the 16G runner at -j4. Slower but safe.
run: make -C contrib/depends HOST="$HOST" -j2 run: make -C contrib/depends HOST="$HOST" -j2
@@ -276,12 +280,16 @@ jobs:
with: with:
path: contrib/depends/sources path: contrib/depends/sources
key: depends-sources-${{ hashFiles('contrib/depends/packages/*') }} key: depends-sources-${{ hashFiles('contrib/depends/packages/*') }}
restore-keys: |
depends-sources-
- name: restore depends built cache - name: restore depends built cache
id: cache-built id: cache-built
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
with: with:
path: contrib/depends/built path: contrib/depends/built
key: depends-built-${{ matrix.host }}-${{ hashFiles('contrib/depends/packages/*', 'contrib/depends/hosts/*', 'contrib/depends/toolchain.cmake.in') }} key: depends-built-${{ matrix.host }}-${{ hashFiles('contrib/depends/packages/*', 'contrib/depends/hosts/*', 'contrib/depends/toolchain.cmake.in') }}
restore-keys: |
depends-built-${{ matrix.host }}-
- name: build depends (static Qt6 + tor + boost + openssl) - name: build depends (static Qt6 + tor + boost + openssl)
run: make -C contrib/depends HOST="$HOST" -j2 run: make -C contrib/depends HOST="$HOST" -j2
- name: save depends sources cache - name: save depends sources cache
contrib/depends/packages/libxkbcommon.mk
+1 -1
View File
@@ -19,7 +19,7 @@ define $(package)_preprocess_cmds
endef endef
define $(package)_config_cmds define $(package)_config_cmds
meson setup --cross-file toolchain.txt build -Dxkb-config-root=/usr/share/X11/xkb -Dxkb-config-extra-path=/app/share/X11/xkb meson setup --cross-file toolchain.txt build -Dxkb-config-root=/usr/share/X11/xkb -Dxkb-config-extra-path=/app/share/X11/xkb -Dxkb-config-unversioned-extensions-path=/usr/share/X11/xkb.d -Dxkb-config-versioned-extensions-path=/usr/share/X11/xkb.d
endef endef
define $(package)_build_cmds define $(package)_build_cmds