From: Markus Niebel <list-09_ptxdist@tqsc.de>
To: ptxdist@pengutronix.de
Cc: m.olbrich@pengutronix.de, Markus Niebel <Markus.Niebel@tq-group.com>
Subject: [ptxdist] [PATCH] socat: fix build system for parallel builds
Date: Wed, 26 Aug 2015 09:06:56 +0200 [thread overview]
Message-ID: <1440572816-423-1-git-send-email-list-09_ptxdist@tqsc.de> (raw)
From: Markus Niebel <Markus.Niebel@tq-group.com>
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>
---
.../socat-1.7.3.0/0001-fix-parallel-build.patch | 23 ++++++++++++++++++++++
patches/socat-1.7.3.0/series | 1 +
2 files changed, 24 insertions(+)
create mode 100644 patches/socat-1.7.3.0/0001-fix-parallel-build.patch
create mode 100644 patches/socat-1.7.3.0/series
diff --git a/patches/socat-1.7.3.0/0001-fix-parallel-build.patch b/patches/socat-1.7.3.0/0001-fix-parallel-build.patch
new file mode 100644
index 0000000..ed01541
--- /dev/null
+++ b/patches/socat-1.7.3.0/0001-fix-parallel-build.patch
@@ -0,0 +1,23 @@
+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>
+---
+
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o proca
+ 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 0000000..51ff874
--- /dev/null
+++ b/patches/socat-1.7.3.0/series
@@ -0,0 +1 @@
+0001-fix-parallel-build.patch
--
2.3.0
--
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2015-08-26 7:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440572816-423-1-git-send-email-list-09_ptxdist@tqsc.de \
--to=list-09_ptxdist@tqsc.de \
--cc=Markus.Niebel@tq-group.com \
--cc=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox