[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/squeekboard][debian/master] d/patches: fix parallel build issues

[Arnaud Ferraris (@a-wai)]

Arnaud Ferraris pushed to branch debian/master at Debian On Mobile / squeekboard


Commits:
17f5b598 by Arnaud Ferraris at 2022-08-04T18:03:31+02:00
d/patches: fix parallel build issues

In some cases (fast, highly parallel build machine),
`squeekboard-test-layout` might be built before `libsqueekboard`,
causing the build to fail.

Modify our patch to make `squeekboard-test-layout` depend on
`libsqueekboard`.

- - - - -


1 changed file:

- debian/patches/meson-build-ensure-libsqueekboard-is-built-first.patch


Changes:

=====================================
debian/patches/meson-build-ensure-libsqueekboard-is-built-first.patch
=====================================
@@ -4,11 +4,12 @@ Subject: meson.build: ensure libsqueekboard is built first
 
 This is required for our ppc64el workaround to build.
 ---
- src/meson.build | 28 +++++++++++++---------------
- 1 file changed, 13 insertions(+), 15 deletions(-)
+ src/meson.build   | 27 +++++++++++++--------------
+ tools/meson.build |  2 +-
+ 2 files changed, 14 insertions(+), 15 deletions(-)
 
 diff --git a/src/meson.build b/src/meson.build
-index af33418..a679bbd 100644
+index af33418..9db99a4 100644
 --- a/src/meson.build
 +++ b/src/meson.build
 @@ -55,6 +55,17 @@ deps = [
@@ -61,8 +62,14 @@ index af33418..a679bbd 100644
    include_directories: [include_directories('..'), include_directories('../eek')],
    dependencies: deps,
    install: true,
-@@ -115,4 +114,3 @@ squeekboard = executable('squeekboard',
-     '-DEEKBOARD_COMPILATION=1',
-     '-DEEK_COMPILATION=1'],
+diff --git a/tools/meson.build b/tools/meson.build
+index 75a7e17..27f6ae1 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -16,5 +16,5 @@ test_layout = custom_target('squeekboard-test-layout',
+         + cargo_build_flags,
+     install: true,
+     install_dir: bindir,
+-    depends: cargo_toml,
++    depends: rslibs,
  )
--



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/commit/17f5b598b41e3a4d2f8f01d6218386f28a23ee77

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/commit/17f5b598b41e3a4d2f8f01d6218386f28a23ee77
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20220804/1754fa3a/attachment-0001.htm>