diff options
| author | Markus Niebel <Markus.Niebel@tq-group.com> | 2015-08-26 09:06:56 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-09-30 17:40:15 +0200 |
| commit | 53de042f92e69871eae573027744fd065fb336b5 (patch) | |
| tree | 95d805097abf85307401f852211129ce1fb9144f /patches/socat-1.7.3.0 | |
| parent | b285891c5dc7d5a6d9b6d311c68dc4c0d51f893a (diff) | |
| download | ptxdist-53de042f92e69871eae573027744fd065fb336b5.tar.gz ptxdist-53de042f92e69871eae573027744fd065fb336b5.tar.xz | |
socat: fix build system for parallel builds
when doing parallel builds, linking of filan sometimes fails.
This patch brings in the fix found in:
http://lists.openembedded.org/pipermail/openembedded-core/2015-May/104718.html
Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
[mol: regenerate patches with git-ptx-patches]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/socat-1.7.3.0')
| -rw-r--r-- | patches/socat-1.7.3.0/0001-Makefile.in-fix-for-parallel-build.patch | 26 | ||||
| -rw-r--r-- | patches/socat-1.7.3.0/series | 4 |
2 files changed, 30 insertions, 0 deletions
diff --git a/patches/socat-1.7.3.0/0001-Makefile.in-fix-for-parallel-build.patch b/patches/socat-1.7.3.0/0001-Makefile.in-fix-for-parallel-build.patch new file mode 100644 index 000000000..77cf6f2a5 --- /dev/null +++ b/patches/socat-1.7.3.0/0001-Makefile.in-fix-for-parallel-build.patch @@ -0,0 +1,26 @@ +From: Markus Niebel <Markus.Niebel@tq-group.de> +Date: Tue, 25 Aug 2015 17:48:55 +0200 +Subject: [PATCH] Makefile.in: fix for parallel build + +Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue. + +original patch for OE-Core by: Robert Yang <liezhi.yang at windriver.com> + +Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.de> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index f2a6edb87890..88b784b1592c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut + procan: $(PROCAN_OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS) + +-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o ++filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS) + + libxio.a: $(XIOOBJS) $(UTLOBJS) diff --git a/patches/socat-1.7.3.0/series b/patches/socat-1.7.3.0/series new file mode 100644 index 000000000..c1c73553c --- /dev/null +++ b/patches/socat-1.7.3.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Makefile.in-fix-for-parallel-build.patch +# 61dca8976a5f7b756e48ea74ebd2750d - git-ptx-patches magic |