Skip to content

Commit

Permalink
[hi3536dv100] fix mavlink-router build (#1062)
Browse files Browse the repository at this point in the history
  • Loading branch information
cronyx authored Oct 18, 2023
1 parent b97316d commit bc30a71
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[constants]
arch = 'arm-openipc'
abi = 'gnueabihf'
abi = 'gnueabi'

[binaries]
c = arch + '-linux-' + abi + '-gcc'
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
6 changes: 5 additions & 1 deletion general/package/mavlink-router/mavlink-router.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bc30a71

Please sign in to comment.