From patchwork Wed Jun 17 17:21:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Davies X-Patchwork-Id: 1311365 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rovoreed.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49nBsK2d3Pz9sRR for ; Thu, 18 Jun 2020 03:29:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A490B8908A; Wed, 17 Jun 2020 17:29:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14moX1E8jfxO; Wed, 17 Jun 2020 17:29:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0AF4288F88; Wed, 17 Jun 2020 17:29:54 +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 393091BF278 for ; Wed, 17 Jun 2020 17:29:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2FCE52040E for ; Wed, 17 Jun 2020 17:29:52 +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 DLIGZhTTOVJY for ; Wed, 17 Jun 2020 17:29:51 +0000 (UTC) X-Greylist: delayed 00:07:18 by SQLgrey-1.7.6 Received: from p3plwbeout01-05.prod.phx3.secureserver.net (p3plsmtp01-05-2.prod.phx3.secureserver.net [72.167.218.89]) by silver.osuosl.org (Postfix) with ESMTPS id 75F8220409 for ; Wed, 17 Jun 2020 17:29:50 +0000 (UTC) Received: from mta4.hi.local ([80.90.192.20]) by :WBEOUT: with ESMTP id lblAjGKZFLZL8lblBjc6Vg; Wed, 17 Jun 2020 10:22:01 -0700 X-CMAE-Analysis: v=2.3 cv=PJhxBsiC c=1 sm=1 tr=0 a=nSKF1BcAsdRsN07JYTDUSA==:117 a=eAy0riY8YFiK2B5mEOfsZQ==:17 a=YnmlCaz7lnEA:10 a=IkcTkHD0fZMA:10 a=nTHF0DUjJn0A:10 a=-72nv8E4AAAA:8 a=6GavP6JCb3vjIUXMXigA:9 a=QEXdDO2ut3YA:10 a=tqZpyQRwyUO3E0r7aqbn:22 X-SECURESERVER-ACCT: busybox_mail@rovoreed.com X-SID: lblAjGKZFLZL8 Received: from 88-145-167-165.host.pobb.as13285.net ([88.145.167.165] helo=modron.home) by mta4.hi.local with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jlbl9-00059U-W6; Wed, 17 Jun 2020 18:22:00 +0100 Message-ID: <0478efa17e8530ec60d74c8e3fff37fccbed614f.camel@rovoreed.com> From: Mike Davies To: buildroot@buildroot.org Date: Wed, 17 Jun 2020 18:21:59 +0100 User-Agent: Evolution 3.32.5 (3.32.5-1.fc30) MIME-Version: 1.0 X-SA-Score: 1.0 X-Heart-Authenticated: busybox_mail@rovoreed.com X-Originating-IP: 88.145.167.165 X-CMAE-Envelope: MS4wfL2XRFGUWaCAvvzLRiwcdYJInvtzy3sfrfcyOaPQz/TCAxmBXajSHFFC00pOrchm1dTu9kfeTEzmDakXzvokGl5MbFfpmQRzd/bo93ektr9xon1ikn9y 6nWhbe02PYiek6oVT0UVUOqUa+NmlGtdBJPjIbTtfq5Gvj+iE26chYHHTn8kq68w39XQ+2eH9Q2UrYPtCFeEFde6TtxvevxmeyjY89Yg24yH4hEQmCT90/l3 zgi/PoMsoPWzVFyXEI/6sw== Subject: [Buildroot] [PATCH 1/1] package/rpi-userland: fix build on 64-bit Raspberry Pi 3 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: "" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Prior to this patch it was not possible to select the package rpi-userland if raspberrypi3_64_defconfig was used. Then the .mk file needed updating to allow 64 bit builds. Signed-off-by: Mike Davies --- package/rpi-userland/Config.in | 4 ++-- package/rpi-userland/rpi-userland.mk | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index 342faf26e3..81f3588822 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_RPI_USERLAND bool "rpi-userland" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS @@ -40,6 +40,6 @@ config BR2_PACKAGE_RPI_USERLAND_HELLO endif comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index efb02f719f..d8b2a281af 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -13,6 +13,12 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +ifeq ($(BR2_aarch64),y) + +RPI_USERLAND_CONF_OPTS += -DARM64=YES + +endif # BR2_aarch64 + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON