From patchwork Fri Jul 24 20:31:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1335942 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=fj6tYBME; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BD17g3KXGz9sRR for ; Sat, 25 Jul 2020 06:31:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E6FA987293; Fri, 24 Jul 2020 20:31:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z_nzKJher14m; Fri, 24 Jul 2020 20:31:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CE6C687150; Fri, 24 Jul 2020 20:31:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 9FAE91BF342 for ; Fri, 24 Jul 2020 20:31:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 96E8F204A9 for ; Fri, 24 Jul 2020 20:31:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uSDE2HsmMb1b for ; Fri, 24 Jul 2020 20:31:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by silver.osuosl.org (Postfix) with ESMTPS id 6FCDA20491 for ; Fri, 24 Jul 2020 20:31:20 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y3so9378368wrl.4 for ; Fri, 24 Jul 2020 13:31:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ff6zcK8ClO3kePI5jmCD+Zip7j24Axo0dyM6Lvmn6aQ=; b=fj6tYBMEQL7uQOk+qyixafMXABEhoAuneOjCmzhYgSPNrOxfbkylI8G34xotK14SaU YQrjtsP52HKslTZ9U8n95wuNY/Cg1QY0tqaKD+JrZ7FEC7L+0UtFYeOeSH7onGx33sxh D0f9O+JZPdRWB3/xcp3IKrGlLw9KSU7yMuAdoc6kiNPzFoaL0rEeLzvKroyjwB69svYC 6aJYqgzR6N7o1mjtGkDL2LZ4xVoDokjXcosokhOcUuvLY3sgrXARjddXsw3PPrmaN1+m hDN1OX2aLP+6wh8ouNBXWAvOixh4fY8U9QtlQuasJCwwMt18Jl+lSXGfUMcLaVusIHXC cbXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ff6zcK8ClO3kePI5jmCD+Zip7j24Axo0dyM6Lvmn6aQ=; b=IF7fImjR/SoX5bWntNHoLxEoz3aTYgNxov513BeAk6BSNBMnfibYrNo4fuRQA8puyQ Eew0W47faWsynjRHPmbMIWXSQ+gtW5bu429/kJbSp3mYKDQvPKr/nozHHd7//L8eb8i8 VI2XuI5XBKZuD0fn9sSy89tv20QNXKopCu7bd0+YQFQ+AzbUqLCx2JvzbKlV4qduu6if wU5BbTpLiJ+xg4ZfH5YF1NJcvb/9rHiP36HRaK+JTzWGGphUdWvHy1MoX5NTNp54Ab5O GEL0/MyjzCZ7W8+vNk3Qgrxi2T1u7vxxKoO7RpwDnfnOzz/AU68yNDvx12Ux4K4tzzHc 7A3A== X-Gm-Message-State: AOAM532RUS17w8aJ+D4fcwK/JUxymjz/N8ejdytMc0Lo9iBXTGAu/ZKw 0Y1WcZ7qor4wUMggGkYsN3T7ZVzm X-Google-Smtp-Source: ABdhPJyW/lixeACqiyaOdE/oEeY9XN2IzX9oBBguNvtKBkfWe1YYrBS9jtUn67q7rEc4L28fSM6XMA== X-Received: by 2002:a05:6000:120c:: with SMTP id e12mr9814324wrx.354.1595622678418; Fri, 24 Jul 2020 13:31:18 -0700 (PDT) Received: from kali.home (lfbn-ren-1-2132-33.w92-167.abo.wanadoo.fr. [92.167.211.33]) by smtp.gmail.com with ESMTPSA id g70sm8638427wmg.24.2020.07.24.13.31.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 13:31:17 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 24 Jul 2020 22:31:03 +0200 Message-Id: <20200724203103.990071-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/mraa: fix architecture X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Pieterjan Camerlynck Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" mraa supports aarch64 since version 0.9.0 and https://github.com/eclipse/mraa/commit/47ec54c3330de176ed0b8e3254e81d9451fb866a mips is supported since version 1.9.0 and https://github.com/eclipse/mraa/commit/6770be911ba18b25ff284eeac80390e4111f602f 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 --- package/mraa/Config.in | 10 +++++++++- package/mraa/mraa.mk | 13 +++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package/mraa/Config.in b/package/mraa/Config.in index 1181965b86..745b235cb3 100644 --- a/package/mraa/Config.in +++ b/package/mraa/Config.in @@ -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 bool "mraa" + depends on BR2_PACKAGE_MRAA_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_arm || BR2_i386 || BR2_x86_64 help mraa is a C/C++ library with bindings to javascript & python to interface with the IO on Galileo, Edison & other @@ -13,5 +20,6 @@ config BR2_PACKAGE_MRAA http://iotdk.intel.com/docs/master/mraa 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 \ || BR2_STATIC_LIBS diff --git a/package/mraa/mraa.mk b/package/mraa/mraa.mk index 23413de08e..9397f12cfd 100644 --- a/package/mraa/mraa.mk +++ b/package/mraa/mraa.mk @@ -10,10 +10,23 @@ MRAA_LICENSE = MIT MRAA_LICENSE_FILES = COPYING 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, # which doesn't exist in buildroot MRAA_CONF_OPTS += \ + -DBUILDARCH=$(MRAA_ARCH) \ -DBUILDSWIG=OFF \ -DUSBPLAT=OFF \ -DFTDI4222=OFF \