Skip to contentSkip to conversation

package/rsyslog: fix musl buil

PATCH New Bernd Kuhls 2 participants 2 messages Feb 5, 2016

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v2 1/1 package/rsyslog: fix musl buil

The build error was not yet being found by the autobuilders:

omfile.c: In function ?prepareFile?:
omfile.c:580:3: error: implicit declaration of function ?open? [-Werror=implicit-function-declaration]
fd = open((char*) newFileName, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY|O_CLOEXEC,
^

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: downloaded patch from upstream commit and added as file (Arnout)

 package/rsyslog/0001-musl-fcntl-h.patch | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/rsyslog/0001-musl-fcntl-h.patch
package/rsyslog/0001-musl-fcntl-h.patch new file +30 -0
new file mode 100644
index 0000000..5c2daee
@@ -0,0 +1,30 @@
+From 835571774dc519dd2cff7ab1020cf298cc953a8f Mon Sep 17 00:00:00 2001
+From: Thordur Bjornsson <[email protected]>
+Date: Tue, 7 Jul 2015 12:34:08 +0200
+Subject: [PATCH] omfile: unconditionally include fcntl.h.
+
+required for open() flags
+
+Signed-off-by: Thordur Bjornsson <[email protected]>
+[Bernd: downloaded from upstream commit:
+ https://github.com/rsyslog/rsyslog/commit/835571774dc519dd2cff7ab1020cf298cc953a8f
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+ tools/omfile.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/tools/omfile.c b/tools/omfile.c
+index 482e723..4444b97 100644
+--- a/tools/omfile.c
++++ b/tools/omfile.c
+@@ -48,9 +48,7 @@
+ #include <libgen.h>
+ #include <unistd.h>
+ #include <sys/file.h>
+-#ifdef OS_SOLARIS
+-#	include <fcntl.h>
+-#endif
++#include <fcntl.h>
+ #ifdef HAVE_ATOMIC_BUILTINS
+ #	include <pthread.h>
+ #endif
Signature · 1 line
2.7.0
Applied
#1 lore raw

PATCH v2 1/1 package/rsyslog: fix musl buil

Dear Bernd Kuhls,

Quoted 10 lines · Bernd Kuhls

The build error was not yet being found by the autobuilders:

omfile.c: In function ?prepareFile?:
omfile.c:580:3: error: implicit declaration of function ?open? [-Werror=implicit-function-declaration]
fd = open((char*) newFileName, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY|O_CLOEXEC,
^

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: downloaded patch from upstream commit and added as file (Arnout)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com