[oe] [meta-oe][PATCH] rsyslog: fix race in parallel builds

[Hongxu Jia]

Accepted by upstream

https://github.com/rsyslog/rsyslog/commit/edce434db0688fc995f39eb1b329c60dbb5ed552

//Hongxu

On 2018年07月27日 10:49, Hongxu Jia wrote:
> If libgcry.la is built later than lmcry_gcry.la, there is a failure:
> [snip]
> |../aarch64-wrs-linux-libtool  --tag=CC   --mode=link aarch64-wrs-linux-gcc
> -o lmcry_gcry.la lmcry_gcry_la-lmcry_gcry.lo libgcry.la -lgcrypt
> |aarch64-wrs-linux-libtool:   error: cannot find the library 'libgcry.la'
> or unhandled argument 'libgcry.la'
> |Makefile:1049: recipe for target 'lmcry_gcry.la' failed
> |make[2]: *** [lmcry_gcry.la] Error 1
> [snip]
>
> The LIBADD of lmcry_gcry.la contains libgcry.la, we should also add libgcry.la
> to lmcry_gcry.la's DEPENDENCIES.
>
> Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
> ---
>   .../rsyslog/fix-race-in-parallel-builds.patch      | 41 ++++++++++++++++++++++
>   meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb |  1 +
>   2 files changed, 42 insertions(+)
>   create mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch
>
> 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
> new file mode 100644
> index 0000000..a1efe4d
> --- /dev/null
> +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/fix-race-in-parallel-builds.patch
> @@ -0,0 +1,41 @@
> +From 7f003e3a7d4d6dda1cbca1694b62754878c58df0 Mon Sep 17 00:00:00 2001
> +From: Hongxu Jia <hongxu.jia at windriver.com>
> +Date: Fri, 27 Jul 2018 10:19:29 +0800
> +Subject: [PATCH] fix race in parallel builds
> +
> +If libgcry.la is built later than lmcry_gcry.la, there is a failure:
> +[snip]
> +|../aarch64-wrs-linux-libtool  --tag=CC   --mode=link aarch64-wrs-linux-gcc
> +-o lmcry_gcry.la lmcry_gcry_la-lmcry_gcry.lo libgcry.la -lgcrypt
> +|aarch64-wrs-linux-libtool:   error: cannot find the library 'libgcry.la'
> +or unhandled argument 'libgcry.la'
> +|Makefile:1049: recipe for target 'lmcry_gcry.la' failed
> +|make[2]: *** [lmcry_gcry.la] Error 1
> +[snip]
> +
> +The LIBADD of lmcry_gcry.la contains libgcry.la, we should also add libgcry.la
> +to lmcry_gcry.la's DEPENDENCIES.
> +
> +Upstream-Status: Submitted [https://github.com/rsyslog/rsyslog/pull/2882]
> +
> +Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
> +---
> + runtime/Makefile.am | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/runtime/Makefile.am b/runtime/Makefile.am
> +index 56bc08e..5ada0c4 100644
> +--- a/runtime/Makefile.am
> ++++ b/runtime/Makefile.am
> +@@ -202,7 +202,7 @@ if ENABLE_LIBGCRYPT
> +    libgcry_la_SOURCES = libgcry.c libgcry_common.c libgcry.h
> +    libgcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
> +    pkglib_LTLIBRARIES += lmcry_gcry.la
> +-   lmcry_gcry_la_DEPENDENCIES = librsyslog.la
> ++   lmcry_gcry_la_DEPENDENCIES = librsyslog.la libgcry.la
> +    lmcry_gcry_la_SOURCES = lmcry_gcry.c lmcry_gcry.h
> +    lmcry_gcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
> +    lmcry_gcry_la_LDFLAGS = -module -avoid-version \
> +--
> +2.7.4
> +
> diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb
> index 386ad32..9737892 100644
> --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb
> +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb
> @@ -24,6 +24,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t
>              file://use-pkgconfig-to-check-libgcrypt.patch \
>              file://run-ptest \
>              file://rsyslog-fix-ptest-not-finish.patch \
> +           file://fix-race-in-parallel-builds.patch \
>   "
>   
>   SRC_URI_append_libc-musl = " \