summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-05-04 01:02:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 11:43:59 +0100
commitb92a75c218f7a0b91e6909d1ea1547f18577721e (patch)
treebf03ea9eeead0b5886dc93ec1bff9a8ac681e59a /meta/recipes-connectivity
parent5f165e1314f9075b0bdd75486e1a24785ed98287 (diff)
downloadpoky-b92a75c218f7a0b91e6909d1ea1547f18577721e.tar.gz
socat: fix for parallel build
Fixed: vsnprintf_r.o: file not recognized: File truncated collect2: error: ld returned 3 exit status Makefile:122: recipe for target 'filan' failed Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue. (From OE-Core rev: ee0a4412d66a2dd001defae7615f02e0617d91ed) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch35
-rw-r--r--meta/recipes-connectivity/socat/socat_1.7.3.0.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch b/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
new file mode 100644
index 0000000000..aa4db65a79
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
@@ -0,0 +1,35 @@
1From c6f0080b55679b6e8b5d332d6e05fdcbda1e4064 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 4 May 2015 00:58:47 -0700
4Subject: [PATCH] Makefile.in: fix for parallel build
5
6Fixed:
7vsnprintf_r.o: file not recognized: File truncated
8collect2: error: ld returned 3 exit status
9Makefile:122: recipe for target 'filan' failed
10
11Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue.
12
13Upstream-Status: Pending
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
16---
17 Makefile.in | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Makefile.in b/Makefile.in
21index f2a6edb..88b784b 100644
22--- a/Makefile.in
23+++ b/Makefile.in
24@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut
25 procan: $(PROCAN_OBJS)
26 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
27
28-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
29+filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
30 $(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)
31
32 libxio.a: $(XIOOBJS) $(UTLOBJS)
33--
341.7.9.5
35
diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.0.bb b/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
index 8923f41d8c..b58e0a73ea 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
13 13
14 14
15SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ 15SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
16 file://Makefile.in-fix-for-parallel-build.patch \
16" 17"
17 18
18SRC_URI[md5sum] = "b607edb65bc6c57f4a43f06247504274" 19SRC_URI[md5sum] = "b607edb65bc6c57f4a43f06247504274"