diff options
author | Rasmus Thomsen <oss@cogitri.dev> | 2019-05-03 11:45:11 +0200 |
---|---|---|
committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-05-04 05:49:36 +0000 |
commit | 2a2668df519dc5b31c6062df42bbef603bbf8075 (patch) | |
tree | cc3bac7184a5ba0ed7dbf71ab77b5a938ce1204c /community/networkmanager/musl-basic.patch | |
parent | c936e3dd1a26903631716f5321ea2f67da289e2b (diff) | |
download | aports-2a2668df519dc5b31c6062df42bbef603bbf8075.tar.bz2 aports-2a2668df519dc5b31c6062df42bbef603bbf8075.tar.xz |
community/networkmanager: update to 1.18.1
Closes GH-7519
Diffstat (limited to 'community/networkmanager/musl-basic.patch')
-rw-r--r-- | community/networkmanager/musl-basic.patch | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/community/networkmanager/musl-basic.patch b/community/networkmanager/musl-basic.patch index a3ad09f774..2e0d562d5a 100644 --- a/community/networkmanager/musl-basic.patch +++ b/community/networkmanager/musl-basic.patch @@ -1,9 +1,25 @@ -Usual fix for musl libc +diff --git a/libnm-core/nm-json.c b/libnm-core/nm-json.c +index aa181a4..98c39fc 100644 +--- 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; +diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h +index c3b9448..e80a938 100644 --- a/shared/systemd/src/basic/stdio-util.h +++ b/shared/systemd/src/basic/stdio-util.h -@@ -19,7 +19,9 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ +@@ -1,7 +1,9 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + #pragma once +#if defined(__GLIBC__) #include <printf.h> @@ -11,11 +27,13 @@ Usual fix for musl libc #include <stdarg.h> #include <stdio.h> #include <sys/types.h> +diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h +index 25e6ab8..7967e8a 100644 --- a/shared/systemd/src/basic/util.h +++ b/shared/systemd/src/basic/util.h -@@ -46,6 +46,12 @@ - #include "missing.h" - #include "time-util.h" +@@ -46,6 +46,12 @@ static inline unsigned u64log2(uint64_t n) { + #endif + } +#if !defined(__GLIBC__) +typedef int (*__compar_fn_t) (const void*, const void*); @@ -23,19 +41,6 @@ Usual fix for musl libc +typedef int (*__compar_d_fn_t) (const void *, const void *, void *); +#endif + - size_t page_size(void) _pure_; - #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) - ---- 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; + static inline unsigned u32ctz(uint32_t n) { + #if __SIZEOF_INT__ == 4 + return n != 0 ? __builtin_ctz(n) : 32; |