Skip to contentSkip to conversation

package/sysklogd: fix musl build

PATCH New Bernd Kuhls 2 participants 2 messages Jan 31, 2016 – Feb 2, 2016

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/sysklogd: fix musl build

The build error was not yet found by the autobuilders:

In file included from klogd.c:266:0:
/home/bernd/buildroot/br3/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/time.h:9:8: error: redefinition of ?struct timespec?

 struct timespec {
        ^

and many others

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/sysklogd/sysklogd.hash | 1 +
 package/sysklogd/sysklogd.mk   | 2 ++
 2 files changed, 3 insertions(+)
package/sysklogd/sysklogd.hash +1 -0
index dd5b89a..aa3bc24 100644
@@ -1,2 +1,3 @@
 # Locally calculated from download (no sig, hash)
 sha256	5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201	sysklogd-1.5.1.tar.gz
+sha256	fd235a445a2fb0100cd84e201b7a0a14e515517b74106cf4dcfd8d820af7bc21	fix-includes.patch
package/sysklogd/sysklogd.mk +2 -0
index de2edf4..a4730b7 100644
@@ -6,6 +6,8 @@
 
 SYSKLOGD_VERSION = 1.5.1
 SYSKLOGD_SITE = http://www.infodrom.org/projects/sysklogd/download
+SYSKLOGD_PATCH = \
+	http://git.alpinelinux.org/cgit/aports/plain/main/sysklogd/fix-includes.patch
 SYSKLOGD_LICENSE = GPLv2+
 SYSKLOGD_LICENSE_FILES = COPYING
Signature · 1 line
2.7.0
#1 lore raw

PATCH 1/1 package/sysklogd: fix musl build

Quoted 27 lines · Bernd Kuhls

The build error was not yet found by the autobuilders:

In file included from klogd.c:266:0:
/home/bernd/buildroot/br3/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/time.h:9:8: error: redefinition of ?struct timespec?

 struct timespec {
        ^

and many others

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/sysklogd/sysklogd.hash | 1 +
 package/sysklogd/sysklogd.mk   | 2 ++
 2 files changed, 3 insertions(+)
package/sysklogd/sysklogd.hash +1 -0
index dd5b89a..aa3bc24 100644
@@ -1,2 +1,3 @@
 # Locally calculated from download (no sig, hash)
 sha256	5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201	sysklogd-1.5.1.tar.gz
+sha256	fd235a445a2fb0100cd84e201b7a0a14e515517b74106cf4dcfd8d820af7bc21	fix-includes.patch
package/sysklogd/sysklogd.mk +0 -0
index de2edf4..a4730b7 100644

package/sysklogd/sysklogd.mk line 10

Quoted 5 lines
package/sysklogd/sysklogd.mk +2 -0
@@ -6,6 +6,8 @@
 
 SYSKLOGD_VERSION = 1.5.1
 SYSKLOGD_SITE = http://www.infodrom.org/projects/sysklogd/download
+SYSKLOGD_PATCH = \
+	http://git.alpinelinux.org/cgit/aports/plain/main/sysklogd/fix-includes.patch

I wonder if it was ever supposed to support non-Linux use cases. Patch should
be part of buildroot after all, and the commit message can be:

Use standard includes instead of glibc-specific version

This fixes the musl build. Some of the non-glibc support is just plain wrong, it's unclear what it was supposed to work on anyway.

With that:

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 4 lines
package/sysklogd/sysklogd.mk +0 -0
 SYSKLOGD_LICENSE = GPLv2+
 SYSKLOGD_LICENSE_FILES = COPYING
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF