sysklogd: Fix 2.0.3 upgrade fallouts on musl

(From OE-Core rev: 59141d95f19c64ef3908e194fb55f240f8be887a)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2019-12-12 19:14:17 +01:00
committed by Richard Purdie
parent 06a0adbb25
commit 5aadf4ec8f
3 changed files with 75 additions and 0 deletions

View File

@@ -0,0 +1,44 @@
From 8c7995ac8da99eed55bf5410c558b1f0a74998d0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 7 Dec 2019 10:27:28 -0800
Subject: [PATCH 1/2] Remove __BEGIN_DECLS/__END_DECLS
The __BEGIN_DECLS and __END_DECLS are internal identifiers in glibc and
are not defined in any standard. Using them fails build on musl
libc, its better to avoid them
Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/syslog.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/syslog.h b/src/syslog.h
index 4fb7627..120a18f 100644
--- a/src/syslog.h
+++ b/src/syslog.h
@@ -221,7 +221,9 @@ struct syslog_data {
.log_mask = 0xff, \
}
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
void openlog (const char *, int, int);
void closelog (void);
@@ -245,7 +247,9 @@ void syslogp_r (int, struct syslog_data *, const char *, const char *,
const char *, ...);
void vsyslogp_r (int, struct syslog_data *, const char *, const char *,
const char *, va_list);
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
#else /* !__KERNEL__ */
--
2.24.0

View File

@@ -0,0 +1,29 @@
From 10cff4ba2d09b30f8f1967f910e8ab08447a8add Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 7 Dec 2019 10:31:04 -0800
Subject: [PATCH 2/2] include sys/types.h for off_t
Fixes
error: unknown type name 'off_t'
Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/compat.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/compat.h b/src/compat.h
index a867636..1ef1bf0 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -34,6 +34,7 @@
#include <pthread.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
/*
* The following macro is used to remove const cast-away warnings
--
2.24.0

View File

@@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
inherit update-rc.d update-alternatives systemd autotools
SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \
file://0002-include-sys-types.h-for-off_t.patch \
file://sysklogd \
"
S = "${WORKDIR}/git"