diff options
author | Kai Kang <kai.kang@windriver.com> | 2020-08-03 14:36:50 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-08-03 10:49:15 -0700 |
commit | 1bb990c6ca1b149c19404fbe006fb6b372af8c4c (patch) | |
tree | 9cc527712c2af9beba1972da5595057e116f22a3 | |
parent | 8e039021071fc8605df4a23f9353547bb019d076 (diff) | |
download | meta-openembedded-1bb990c6ca1b149c19404fbe006fb6b372af8c4c.tar.gz |
rdist: fix parallel build
It fails to compile rdist occasionally when system load of build server
is high:
| In file included from common.c:57:
| ../include/defs.h:49:10: fatal error: y.tab.h: No such file or directory
| 49 | #include "y.tab.h"
| | ^~~~~~~~~
| compilation terminated.
Make $(COMMONOBJS) which include common.o to depends on related header files
and y.tab.h to fix the parallel build failure.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch | 31 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch b/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch new file mode 100644 index 0000000000..f35e96a34f --- /dev/null +++ b/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | It fails to produce common.o when system load is high: | ||
2 | |||
3 | | In file included from common.c:57: | ||
4 | | ../include/defs.h:49:10: fatal error: y.tab.h: No such file or directory | ||
5 | | 49 | #include "y.tab.h" | ||
6 | | | ^~~~~~~~~ | ||
7 | | compilation terminated. | ||
8 | |||
9 | Make $(COMMONOBJS) which include common.o to depends on related header files | ||
10 | and y.tab.h to fix the parallel build failure. | ||
11 | |||
12 | Upstream-Status: Inappropriate [no upstream] | ||
13 | |||
14 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
15 | --- | ||
16 | src/Makefile.real | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/Makefile.real b/src/Makefile.real | ||
20 | index e0f0dfc..53d4944 100644 | ||
21 | --- a/src/Makefile.real | ||
22 | +++ b/src/Makefile.real | ||
23 | @@ -41,7 +41,7 @@ $(SERVER_BIN): $(SERVEROBJS) $(COMMONOBJS) $(MISSINGOBJS) | ||
24 | $(CLIENT_BIN): $(CLIENTOBJS) $(COMMONOBJS) $(MISSINGOBJS) | ||
25 | $(CC) -o $@ $(CLIENTOBJS) $(COMMONOBJS) $(MISSINGOBJS) $(LIBS) $(LDFLAGS) | ||
26 | |||
27 | -$(CLIENTOBJS) $(SERVEROBJS): $(HFILES) y.tab.h | ||
28 | +$(COMMONOBJS) $(CLIENTOBJS) $(SERVEROBJS): $(HFILES) y.tab.h | ||
29 | |||
30 | y.tab.h: gram.c | ||
31 | |||
diff --git a/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb index 3a27c2c5b3..37b3eebe4b 100644 --- a/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb +++ b/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb | |||
@@ -28,6 +28,7 @@ SRC_URI += "file://rdist-6.1.5-linux.patch \ | |||
28 | file://rdist-6.1.5-fix-msgsndnotify-loop.patch \ | 28 | file://rdist-6.1.5-fix-msgsndnotify-loop.patch \ |
29 | file://rdist-6.1.5-bb-build.patch \ | 29 | file://rdist-6.1.5-bb-build.patch \ |
30 | file://rdist-6.1.5-makefile-add-ldflags.patch \ | 30 | file://rdist-6.1.5-makefile-add-ldflags.patch \ |
31 | file://rdist-6.1.5-fix-parallel-build.patch \ | ||
31 | " | 32 | " |
32 | 33 | ||
33 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/rdist/files/rdist/" | 34 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/rdist/files/rdist/" |