summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch')
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch
deleted file mode 100644
index a1efe4d4b..000000000
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 7f003e3a7d4d6dda1cbca1694b62754878c58df0 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 27 Jul 2018 10:19:29 +0800
4Subject: [PATCH] fix race in parallel builds
5
6If libgcry.la is built later than lmcry_gcry.la, there is a failure:
7[snip]
8|../aarch64-wrs-linux-libtool --tag=CC --mode=link aarch64-wrs-linux-gcc
9-o lmcry_gcry.la lmcry_gcry_la-lmcry_gcry.lo libgcry.la -lgcrypt
10|aarch64-wrs-linux-libtool: error: cannot find the library 'libgcry.la'
11or unhandled argument 'libgcry.la'
12|Makefile:1049: recipe for target 'lmcry_gcry.la' failed
13|make[2]: *** [lmcry_gcry.la] Error 1
14[snip]
15
16The LIBADD of lmcry_gcry.la contains libgcry.la, we should also add libgcry.la
17to lmcry_gcry.la's DEPENDENCIES.
18
19Upstream-Status: Submitted [https://github.com/rsyslog/rsyslog/pull/2882]
20
21Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22---
23 runtime/Makefile.am | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/runtime/Makefile.am b/runtime/Makefile.am
27index 56bc08e..5ada0c4 100644
28--- a/runtime/Makefile.am
29+++ b/runtime/Makefile.am
30@@ -202,7 +202,7 @@ if ENABLE_LIBGCRYPT
31 libgcry_la_SOURCES = libgcry.c libgcry_common.c libgcry.h
32 libgcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
33 pkglib_LTLIBRARIES += lmcry_gcry.la
34- lmcry_gcry_la_DEPENDENCIES = librsyslog.la
35+ lmcry_gcry_la_DEPENDENCIES = librsyslog.la libgcry.la
36 lmcry_gcry_la_SOURCES = lmcry_gcry.c lmcry_gcry.h
37 lmcry_gcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
38 lmcry_gcry_la_LDFLAGS = -module -avoid-version \
39--
402.7.4
41