NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/mraa: fix architecture

Browse Source 
mraa supports aarch64 since version 0.9.0 and
47ec54c333

mips is supported since version 1.9.0 and
6770be911b

Moreover, BUILD_ARCH must be passed otherwise build will fail on i686
and arm

Fixes:
 - http://autobuild.buildroot.org/results/8e99eb282668f6f83f43c5be45112d82936e3408
 - http://autobuild.buildroot.org/results/75ba0840da6eb4907847ef05adeec2df109c9937

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2020-07-24 22:31:03 +02:00 committed by Peter Korsgaard
parent 63360d1493
commit 76d9049a2a
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/mraa/Config.in
View File

@ -1,9 +1,16 @@
config BR2_PACKAGE_MRAA_ARCH_SUPPORTS
bool
default y if BR2_aarch64 || BR2_aarch64_be
default y if BR2_arm || BR2_armeb
default y if BR2_i386 || BR2_x86_64
default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
config BR2_PACKAGE_MRAA config BR2_PACKAGE_MRAA
bool "mraa" bool "mraa"
depends on BR2_PACKAGE_MRAA_ARCH_SUPPORTS
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_arm || BR2_i386 || BR2_x86_64
help help
mraa is a C/C++ library with bindings to javascript & python mraa is a C/C++ library with bindings to javascript & python
to interface with the IO on Galileo, Edison & other to interface with the IO on Galileo, Edison & other
@ -13,5 +20,6 @@ config BR2_PACKAGE_MRAA
http://iotdk.intel.com/docs/master/mraa http://iotdk.intel.com/docs/master/mraa
comment "mraa needs a toolchain w/ C++, threads, dynamic library" comment "mraa needs a toolchain w/ C++, threads, dynamic library"
depends on BR2_PACKAGE_MRAA_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
|| BR2_STATIC_LIBS || BR2_STATIC_LIBS

13
package/mraa/mraa.mk
View File

@ -10,10 +10,23 @@ MRAA_LICENSE = MIT
MRAA_LICENSE_FILES = COPYING MRAA_LICENSE_FILES = COPYING
MRAA_INSTALL_STAGING = YES MRAA_INSTALL_STAGING = YES
ifeq ($(BR2_i386),y)
MRAA_ARCH = i386
else ifeq ($(BR2_x86_64),y)
MRAA_ARCH = x86_64
else ifeq ($(BR2_arm)$(BR2_armeb),y)
MRAA_ARCH = arm
else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y)
MRAA_ARCH = aarch64
else ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
MRAA_ARCH = mips
endif
# USBPLAT only makes sense with FTDI4222, which requires the ftd2xx library, # USBPLAT only makes sense with FTDI4222, which requires the ftd2xx library,
# which doesn't exist in buildroot # which doesn't exist in buildroot
MRAA_CONF_OPTS += \ MRAA_CONF_OPTS += \
-DBUILDARCH=$(MRAA_ARCH) \
-DBUILDSWIG=OFF \ -DBUILDSWIG=OFF \
-DUSBPLAT=OFF \ -DUSBPLAT=OFF \
-DFTDI4222=OFF \ -DFTDI4222=OFF \