From 5b7082bf8ede72a97d876186fcbeb6502d2c43cb Mon Sep 17 00:00:00 2001
From: cronyx <xcronyx@gmail.com>
Date: Wed, 18 Oct 2023 19:58:07 +0300
Subject: [PATCH] [hi3536dv100] fix mavlink-router build

---
 .../files/meson-cross-arm-glibc-hf-openipc.ini   | 16 ++++++++++++++++
 .../files/meson-cross-arm-glibc-openipc.ini      |  2 +-
 .../files/meson-cross-arm-musl-hf-openipc.ini    | 16 ++++++++++++++++
 general/package/mavlink-router/mavlink-router.mk |  6 +++++-
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 general/package/mavlink-router/files/meson-cross-arm-glibc-hf-openipc.ini
 create mode 100644 general/package/mavlink-router/files/meson-cross-arm-musl-hf-openipc.ini

diff --git a/general/package/mavlink-router/files/meson-cross-arm-glibc-hf-openipc.ini b/general/package/mavlink-router/files/meson-cross-arm-glibc-hf-openipc.ini
new file mode 100644
index 00000000..3dbd6ee8
--- /dev/null
+++ b/general/package/mavlink-router/files/meson-cross-arm-glibc-hf-openipc.ini
@@ -0,0 +1,16 @@
+[constants]
+arch = 'arm-openipc'
+abi = 'gnueabihf'
+
+[binaries]
+c = arch + '-linux-' + abi + '-gcc'
+cpp = arch + '-linux-' + abi + '-g++'
+ar = arch + '-linux-'+ abi + '-gcc-ar'
+strip = arch + '-linux-' + abi + '-strip'
+pkgconfig = 'pkg-config'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'arm'
+cpu = 'armv7l'
+endian = 'little'
diff --git a/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini b/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini
index 3dbd6ee8..89ce1db0 100644
--- a/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini
+++ b/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini
@@ -1,6 +1,6 @@
 [constants]
 arch = 'arm-openipc'
-abi = 'gnueabihf'
+abi = 'gnueabi'
 
 [binaries]
 c = arch + '-linux-' + abi + '-gcc'
diff --git a/general/package/mavlink-router/files/meson-cross-arm-musl-hf-openipc.ini b/general/package/mavlink-router/files/meson-cross-arm-musl-hf-openipc.ini
new file mode 100644
index 00000000..e78faf3e
--- /dev/null
+++ b/general/package/mavlink-router/files/meson-cross-arm-musl-hf-openipc.ini
@@ -0,0 +1,16 @@
+[constants]
+arch = 'arm-openipc'
+abi = 'musleabihf'
+
+[binaries]
+c = arch + '-linux-' + abi + '-gcc'
+cpp = arch + '-linux-' + abi + '-g++'
+ar = arch + '-linux-'+ abi + '-gcc-ar'
+strip = arch + '-linux-' + abi + '-strip'
+pkgconfig = 'pkg-config'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'arm'
+cpu = 'armv7l'
+endian = 'little'
diff --git a/general/package/mavlink-router/mavlink-router.mk b/general/package/mavlink-router/mavlink-router.mk
index 01cb9436..a4c1b886 100644
--- a/general/package/mavlink-router/mavlink-router.mk
+++ b/general/package/mavlink-router/mavlink-router.mk
@@ -18,9 +18,13 @@ else
 MAVLINK_ROUTER_LIBC = musl
 endif
 
+ifeq ($(BR2_ARM_EABIHF),y)
+MAVLINK_ROUTER_ABI = -hf
+endif
+
 MAVLINK_ROUTER_CONF_OPTS += \
 	--buildtype=release \
-	--cross-file $(MAVLINK_ROUTER_PKGDIR)/files/meson-cross-$(ARCH)-$(MAVLINK_ROUTER_LIBC)-openipc.ini
+	--cross-file $(MAVLINK_ROUTER_PKGDIR)/files/meson-cross-$(ARCH)-$(MAVLINK_ROUTER_LIBC)$(MAVLINK_ROUTER_ABI)-openipc.ini
 
 define MAVLINK_ROUTER_CONFIGURE_CMDS
 	$(TARGET_MAKE_ENV) meson setup $(MAVLINK_ROUTER_CONF_OPTS) $(@D) $(@D)/build