rsyslog: Fix function inline errors in debug optimization

Compiler does not inline any functions when using debug optimization (-Og).
Hence, remove -Winline flag when compiling with debug optimization.

Backport upstream fix: https://github.com/rsyslog/librelp/pull/258
Remove previous local fix: https://github.com/rsyslog/librelp/issues/256

Signed-off-by: Nicolas Marguet <nicolas.marguet@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Nicolas Marguet
2023-08-03 13:51:23 -07:00
committed by Khem Raj
parent 61d14138c2
commit 16e1555f6c
2 changed files with 35 additions and 4 deletions
@@ -0,0 +1,34 @@
From 6d575d98565ce3119a14359eecb11ccdff92a303 Mon Sep 17 00:00:00 2001
From: Yash Shinde <53660251+Yashinde145@users.noreply.github.com>
Date: Thu, 29 Jun 2023 18:10:15 +0530
Subject: [PATCH] Fix function inline errors in debug optimization (-Og)
Compiler does not inline any functions when using debug optimization (-Og).
Hence, remove -Winline flag when compiling with debug optimization.
Signed-off-by: Nicolas Marguet <nicolas.marguet@windriver.com>
---
Upstream-Status: Backport [https://github.com/rsyslog/librelp/commit/6d575d9]
configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
index 21c1fde..1204c4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,6 +230,12 @@ if test "$enable_debug" = "no"; then
AC_DEFINE(NDEBUG, 1, [Defined if debug mode is disabled.])
fi
+#Compiler does not inline any functions when not optimizing(-Og).
+#Hence, remove -Winline flag when DEBUG is enabled.
+#ifdef DEBUG
+WARN_CFLAGS="$(echo "$WARN_CFLAGS" | sed s/-Winline//g)"
+#endif
+
# valgrind
AC_ARG_ENABLE(valgrind,
[AS_HELP_STRING([--enable-valgrind],[Enable valgrind tests@<:@default=yes@:>@])],
--
2.39.0
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1fb9c10ed9fd6826757615455ca893a9"
DEPENDS = "gmp nettle libidn zlib gnutls openssl"
SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \
file://0001-Fix-function-inline-errors-in-debug-optimization-Og.patch \
"
SRCREV = "b421f56d9ee31a966058d23bd23c966221c91396"
@@ -14,7 +15,3 @@ SRCREV = "b421f56d9ee31a966058d23bd23c966221c91396"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
DEBUG_OPTIMIZATION:append = " -Wno-error=inline"