mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-09 17:03:35 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/syslog-ng: fix non-c++ build

Browse Source 
Buildroot commit 18630db8e8 bumped the
package from 4.7.1 to 4.8.1. Upstream version 4.8.0 includes commit
163c894563
which causes build errors with non-c++ toolchains:
https://github.com/syslog-ng/syslog-ng/issues/5040

Fixes:
https://autobuild.buildroot.net/results/70c/70ca3364da15383a8270d180cd2bf67977d9cb56/

The earliest build error recorded by the autobuilders dates back to
2025-04-23 so a backport should be considered:
https://autobuild.buildroot.net/results/dd2/dd2b1dedbd92280dac01ae4d6454ef7eb08cc539/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 2caf72537a)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
Bernd Kuhls
2026-01-25 13:21:13 +01:00
committed by Thomas Perale
parent 35ac2bb855
commit f708e5c207
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
package/syslog-ng/0001-Revert-grpc-fix-C-standard-lib-linkage.patch Normal file
View File

@@ -0,0 +1,30 @@
From 1b93cb5890d502ab3fd7623306a7feaa09c4d8ff Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd@kuhls.net>
Date: Sun, 25 Jan 2026 13:07:29 +0100
Subject: [PATCH] Revert "grpc: fix C++ standard lib linkage"
This partially reverts commit 163c894563c9f5536c5e91222c9efda64031b08c.
Upstream: https://github.com/syslog-ng/syslog-ng/issues/5040#issuecomment-3796535385
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
modules/examples/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/examples/Makefile.am b/modules/examples/Makefile.am
index fe1a08feb..5914e5273 100644
--- a/modules/examples/Makefile.am
+++ b/modules/examples/Makefile.am
@@ -35,7 +35,7 @@ EXTRA_modules_examples_libexamples_la_DEPENDENCIES = $(MODULE_DEPS_LIBS) $(EXAMP
modules_examples_libexamples_la_LDFLAGS = $(MODULE_LDFLAGS)
if ENABLE_CPP
-nodist_EXTRA_modules_examples_libexamples_la_SOURCES = force-cpp-linker-with-default-stdlib.cpp
+modules_examples_libexamples_la_LIBADD += -lstdc++
endif
EXTRA_DIST += modules/examples/CMakeLists.txt
--
2.47.3

2
package/syslog-ng/syslog-ng.mk
View File

@@ -11,6 +11,8 @@ SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-n
SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt
SYSLOG_NG_CPE_ID_VENDOR = oneidentity
# 0001-Revert-grpc-fix-C-standard-lib-linkage.patch
SYSLOG_NG_AUTORECONF = YES
SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
json-c libglib2 openssl pcre2
SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \