271aba5d0f
Due to the following dependency chain, it is currently not available
in Alpine for armhf and armv7. This breaks postmarketos-base.
postmarketos-base -> networkmanager -> polkit -> mozjs60
This can be reverted, when networkmanager is back for arm{hf,v7} in
Alpine. The mozjs60 arm fix is from here:
https://github.com/alpinelinux/aports/pull/7561
Related: #244
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
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
|
|
@@ -1,7 +1,9 @@
|
|
/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
#pragma once
|
|
|
|
+#if defined(__GLIBC__)
|
|
#include <printf.h>
|
|
+#endif
|
|
#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 @@ static inline unsigned u64log2(uint64_t n) {
|
|
#endif
|
|
}
|
|
|
|
+#if !defined(__GLIBC__)
|
|
+typedef int (*__compar_fn_t) (const void*, const void*);
|
|
+typedef __compar_fn_t comparison_fn_t;
|
|
+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
|
|
+#endif
|
|
+
|
|
static inline unsigned u32ctz(uint32_t n) {
|
|
#if __SIZEOF_INT__ == 4
|
|
return n != 0 ? __builtin_ctz(n) : 32;
|