diff options
Diffstat (limited to 'community/networkmanager/musl-basic.patch')
| -rw-r--r-- | community/networkmanager/musl-basic.patch | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/community/networkmanager/musl-basic.patch b/community/networkmanager/musl-basic.patch index 3d5bb1dca2..533ed98449 100644 --- a/community/networkmanager/musl-basic.patch +++ b/community/networkmanager/musl-basic.patch @@ -24,23 +24,9 @@ size_t page_size(void) _pure_; #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) ---- a/src/systemd/src/basic/parse-util.c -+++ b/src/systemd/src/basic/parse-util.c -@@ -25,7 +25,11 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#if defined(__GLIBC__) - #include <xlocale.h> -+#else -+#include <locale.h> -+#endif - - #include "alloc-util.h" - #include "extract-word.h" --- a/src/systemd/sd-adapt/nm-sd-adapt.h +++ b/src/systemd/sd-adapt/nm-sd-adapt.h -@@ -119,7 +119,7 @@ +@@ -134,7 +134,7 @@ # ifdef HAVE___SECURE_GETENV # define secure_getenv __secure_getenv # else @@ -49,17 +35,30 @@ # endif #endif ---- a/src/systemd/src/systemd/sd-event.h -+++ b/src/systemd/src/systemd/sd-event.h -@@ -69,11 +69,7 @@ - typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata); - typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata); - typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata); --#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED - typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata); --#else --typedef void* sd_event_child_handler_t; --#endif +--- a/src/systemd/src/basic/process-util.c ++++ b/src/systemd/src/basic/process-util.c +@@ -1018,8 +1018,9 @@ + /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc + * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against + * libpthread, as it is part of glibc anyway. */ +-extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle); +-extern void* __dso_handle __attribute__ ((__weak__)); ++//extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle); ++//extern void* __dso_handle __attribute__ ((__weak__)); ++#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) - int sd_event_default(sd_event **e); + pid_t getpid_cached(void) { + pid_t current_value; +--- a/libnm-core/nm-json.c ++++ b/libnm-core/nm-json.c +@@ -23,6 +23,10 @@ + #include <dlfcn.h> + ++#ifndef RTLD_DEEPBIND ++#define RTLD_DEEPBIND 0 ++#endif ++ + void *_nm_jansson_json_object_iter_value; + void *_nm_jansson_json_object_key_to_iter; + void *_nm_jansson_json_integer; |