From 1bb990c6ca1b149c19404fbe006fb6b372af8c4c Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Mon, 3 Aug 2020 14:36:50 +0800 Subject: 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 Signed-off-by: Khem Raj --- .../rdist-6.1.5-fix-parallel-build.patch | 31 ++++++++++++++++++++++ .../recipes-connectivity/rdist/rdist_6.1.5.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch (limited to 'meta-networking/recipes-connectivity/rdist') 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 @@ +It fails to produce common.o when system load 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. + +Upstream-Status: Inappropriate [no upstream] + +Signed-off-by: Kai Kang +--- + src/Makefile.real | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.real b/src/Makefile.real +index e0f0dfc..53d4944 100644 +--- a/src/Makefile.real ++++ b/src/Makefile.real +@@ -41,7 +41,7 @@ $(SERVER_BIN): $(SERVEROBJS) $(COMMONOBJS) $(MISSINGOBJS) + $(CLIENT_BIN): $(CLIENTOBJS) $(COMMONOBJS) $(MISSINGOBJS) + $(CC) -o $@ $(CLIENTOBJS) $(COMMONOBJS) $(MISSINGOBJS) $(LIBS) $(LDFLAGS) + +-$(CLIENTOBJS) $(SERVEROBJS): $(HFILES) y.tab.h ++$(COMMONOBJS) $(CLIENTOBJS) $(SERVEROBJS): $(HFILES) y.tab.h + + y.tab.h: gram.c + 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 \ file://rdist-6.1.5-fix-msgsndnotify-loop.patch \ file://rdist-6.1.5-bb-build.patch \ file://rdist-6.1.5-makefile-add-ldflags.patch \ + file://rdist-6.1.5-fix-parallel-build.patch \ " UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/rdist/files/rdist/" -- cgit v1.2.3-54-g00ecf