summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-03-07 10:58:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-07 21:55:29 +0000
commit856d6207550f7e4993e76ba6f928d69d7acd32b8 (patch)
tree24d72b86b1dd2fa8dd3c5285fca370455557cbc6 /meta/recipes-core/systemd/systemd
parentc8a0da63917302e699f59c612ffe2ab626f02952 (diff)
downloadpoky-856d6207550f7e4993e76ba6f928d69d7acd32b8.tar.gz
systemd: backport patch to fix parallel build failure
Backport patch to fix parallel build failure like below. In file included from ../git/src/core/dbus-manager.c:10: ../git/src/basic/build.h:4:10: fatal error: version.h: No such file or directory #include "version.h" ^~~~~~~~~~~ compilation terminated. (From OE-Core rev: 89712946c10f1c762175053e1945b7d0f330c446) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch118
1 files changed, 118 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch b/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch
new file mode 100644
index 0000000000..01936f2857
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch
@@ -0,0 +1,118 @@
1From 9f86d8769ab830a724c84f849975b5595e26b47c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
3Date: Sun, 24 Feb 2019 22:49:38 +0100
4Subject: [PATCH] meson: declare version.h as dep for various targets that
5 include build.h
6
7Should fix #11565.
8
9Upstream-Status: Backport
10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12---
13 meson.build | 19 +++++++++++++------
14 src/core/meson.build | 3 ++-
15 src/udev/meson.build | 1 +
16 3 files changed, 16 insertions(+), 7 deletions(-)
17
18diff --git a/meson.build b/meson.build
19index 30df834..232f3e1 100644
20--- a/meson.build
21+++ b/meson.build
22@@ -1637,7 +1637,8 @@ exe = executable('systemd-analyze',
23 include_directories : includes,
24 link_with : [libcore,
25 libshared],
26- dependencies : [threads,
27+ dependencies : [versiondep,
28+ threads,
29 librt,
30 libseccomp,
31 libselinux,
32@@ -2183,7 +2184,8 @@ if conf.get('ENABLE_IMPORTD') == 1
33 systemd_pull_sources,
34 include_directories : includes,
35 link_with : [libshared],
36- dependencies : [libcurl,
37+ dependencies : [versiondep,
38+ libcurl,
39 libz,
40 libbzip2,
41 libxz,
42@@ -2232,7 +2234,8 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1
43 systemd_journal_upload_sources,
44 include_directories : includes,
45 link_with : [libshared],
46- dependencies : [threads,
47+ dependencies : [versiondep,
48+ threads,
49 libcurl,
50 libgnutls,
51 libxz,
52@@ -2558,6 +2561,7 @@ exe = executable('systemd-stdio-bridge',
53 'src/stdio-bridge/stdio-bridge.c',
54 include_directories : includes,
55 link_with : [libshared],
56+ dependencies : [versiondep],
57 install_rpath : rootlibexecdir,
58 install : true)
59 public_programs += exe
60@@ -2641,7 +2645,8 @@ exe = executable('systemd-udevd',
61 link_with : [libudev_core,
62 libsystemd_network,
63 libudev_static],
64- dependencies : [threads,
65+ dependencies : [versiondep,
66+ threads,
67 libkmod,
68 libidn,
69 libacl,
70@@ -2658,7 +2663,8 @@ exe = executable('udevadm',
71 link_with : [libudev_core,
72 libsystemd_network,
73 libudev_static],
74- dependencies : [threads,
75+ dependencies : [versiondep,
76+ threads,
77 libkmod,
78 libidn,
79 libacl,
80@@ -2798,7 +2804,8 @@ foreach tuple : tests
81 sources,
82 include_directories : incs,
83 link_with : link_with,
84- dependencies : dependencies,
85+ dependencies : [versiondep,
86+ dependencies],
87 c_args : defs,
88 build_by_default : want_tests != 'false',
89 install_rpath : rootlibexecdir,
90diff --git a/src/core/meson.build b/src/core/meson.build
91index 85021bd..88fb093 100644
92--- a/src/core/meson.build
93+++ b/src/core/meson.build
94@@ -150,7 +150,8 @@ libcore = static_library(
95 load_fragment_gperf_c,
96 load_fragment_gperf_nulstr_c,
97 include_directories : includes,
98- dependencies : [threads,
99+ dependencies : [versiondep,
100+ threads,
101 librt,
102 libseccomp,
103 libpam,
104diff --git a/src/udev/meson.build b/src/udev/meson.build
105index 9d3f6d1..973a75e 100644
106--- a/src/udev/meson.build
107+++ b/src/udev/meson.build
108@@ -180,6 +180,7 @@ foreach prog : [['ata_id/ata_id.c'],
109 prog,
110 include_directories : includes,
111 c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
112+ dependencies : [versiondep],
113 link_with : [libudev_static],
114 install_rpath : udev_rpath,
115 install : true,
116--
1172.7.4
118