diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-05-04 01:02:24 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-14 11:41:13 +0100 |
| commit | ee0a4412d66a2dd001defae7615f02e0617d91ed (patch) | |
| tree | 5356083faff6da77c5c6287f559d3800461fd0c9 /meta/recipes-connectivity | |
| parent | c5adb5903bd93f1c71acd52062d8c8620de2f944 (diff) | |
| download | openembedded-core-contrib-ee0a4412d66a2dd001defae7615f02e0617d91ed.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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-connectivity/socat/socat_1.7.3.0.bb | 1 |
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 @@ +From c6f0080b55679b6e8b5d332d6e05fdcbda1e4064 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 4 May 2015 00:58:47 -0700 +Subject: [PATCH] Makefile.in: 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. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index f2a6edb..88b784b 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) +-- +1.7.9.5 + 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 \ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ + file://Makefile.in-fix-for-parallel-build.patch \ " SRC_URI[md5sum] = "b607edb65bc6c57f4a43f06247504274" |