summaryrefslogtreecommitdiffstats
path: root/patches/socat-1.7.3.2
diff options
context:
space:
mode:
authorJon Ringle <jringle@gridpoint.com>2018-08-03 15:08:09 -0400
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-08-31 10:13:31 +0200
commit19293d396b68ae03adcbbe2eecd2c4fc1f568f61 (patch)
tree5e5fac448f736cfe750bb31bdb3d28ca64c367a8 /patches/socat-1.7.3.2
parent6d435e4e32f4f510e90cded7f19022bd53bdd79c (diff)
downloadptxdist-19293d396b68ae03adcbbe2eecd2c4fc1f568f61.tar.gz
ptxdist-19293d396b68ae03adcbbe2eecd2c4fc1f568f61.tar.xz
socat: version bump 1.7.3.0 => 1.7.3.2
Signed-off-by: Jon Ringle <jringle@gridpoint.com> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/socat-1.7.3.2')
-rw-r--r--patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch26
-rw-r--r--patches/socat-1.7.3.2/series4
2 files changed, 30 insertions, 0 deletions
diff --git a/patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch b/patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch
new file mode 100644
index 000000000..77cf6f2a5
--- /dev/null
+++ b/patches/socat-1.7.3.2/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.2/series b/patches/socat-1.7.3.2/series
new file mode 100644
index 000000000..c1c73553c
--- /dev/null
+++ b/patches/socat-1.7.3.2/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