mirror of
https://github.com/novatiq/packages.git
synced 2026-07-30 15:23:07 +01:00
Hans Dedecker
fbbab2e7a7
musl.h was included before _GNU_SOURCE in 101-musl-fixes patch leading to compilation issue on gcc (RTLD_DEFAULT not being defined in dlfcn.h due to __USE_GNU not being set). As described in the feature test macro man page feature macro can be defined in the source code but need to be defined before including any headers. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
85 lines
1.8 KiB
Diff
85 lines
1.8 KiB
Diff
--- a/src/libstrongswan/library.h
|
|
+++ b/src/libstrongswan/library.h
|
|
@@ -118,6 +118,7 @@
|
|
#include "utils/leak_detective.h"
|
|
#include "plugins/plugin_loader.h"
|
|
#include "settings/settings.h"
|
|
+#include "musl.h"
|
|
|
|
typedef struct library_t library_t;
|
|
|
|
--- /dev/null
|
|
+++ b/src/libstrongswan/musl.h
|
|
@@ -0,0 +1,39 @@
|
|
+#include <sys/types.h>
|
|
+
|
|
+#define crypt x_crypt
|
|
+#define encrypt x_encrypt
|
|
+#include <unistd.h>
|
|
+
|
|
+#define fd_set x_fd_set
|
|
+#define ino_t x_ino_t
|
|
+#define off_t x_off_t
|
|
+#define loff_t x_loff_t
|
|
+#define dev_t x_dev_t
|
|
+#define mode_t x_mode_t
|
|
+#define uid_t x_uid_t
|
|
+#define gid_t x_gid_t
|
|
+#define uint64_t x_uint64_t
|
|
+#define u_int64_t x_u_int64_t
|
|
+#define int64_t x_int64_t
|
|
+#define nlink_t x_nlink_t
|
|
+#define timer_t x_timer_t
|
|
+#define blkcnt_t x_blkcnt_t
|
|
+#define __kernel_nlink_t void
|
|
+
|
|
+#include <linux/types.h>
|
|
+
|
|
+#undef fd_set
|
|
+#undef ino_t
|
|
+#undef off_t
|
|
+#undef dev_t
|
|
+#undef mode_t
|
|
+#undef uid_t
|
|
+#undef gid_t
|
|
+#undef uint64_t
|
|
+#undef u_int64_t
|
|
+#undef int64_t
|
|
+#undef nlink_t
|
|
+#undef timer_t
|
|
+#undef blkcnt_t
|
|
+#undef crypt
|
|
+#undef encrypt
|
|
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
|
|
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
|
|
@@ -19,6 +19,7 @@
|
|
*/
|
|
|
|
#define _GNU_SOURCE
|
|
+#include <musl.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <stdint.h>
|
|
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
|
|
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
|
|
@@ -37,6 +37,8 @@
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
+#include "musl.h"
|
|
+
|
|
#include <sys/socket.h>
|
|
#include <sys/utsname.h>
|
|
#include <linux/netlink.h>
|
|
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
|
|
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
|
|
@@ -15,6 +15,8 @@
|
|
* for more details.
|
|
*/
|
|
|
|
+#include "musl.h"
|
|
+
|
|
#include <sys/socket.h>
|
|
#include <linux/netlink.h>
|
|
#include <linux/rtnetlink.h>
|