From patchwork Sat Feb 13 17:40:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1440243 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=lmi8fX16; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DdHhG40n6z9sRN for ; Sun, 14 Feb 2021 04:40:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A64CC86B12; Sat, 13 Feb 2021 17:40:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0lt5eeUVJSjH; Sat, 13 Feb 2021 17:40:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 693EB86963; Sat, 13 Feb 2021 17:40:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 584A21BF2F6 for ; Sat, 13 Feb 2021 17:40:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5540786963 for ; Sat, 13 Feb 2021 17:40:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2fp9CZfTbDNR for ; Sat, 13 Feb 2021 17:40:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id A0F91868CB for ; Sat, 13 Feb 2021 17:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1613238014; bh=bh5Z0i/ecsEdJECZzHB3wJxYPLO5866BNTG5xGJCvNs=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=lmi8fX16gOvyA36JHxUK4JDBA1hsC6kq8Qth2Rv1nEmVdhElA5NgNNCOLA127x/7v V20z04x/BhrAp1KQ1XHyFWLtI+ZJT0ostnSbSBXpyOR71hlX9tUMUBAbOs3wf+5Qqx AXvKf0W+zQDomVaTO3PhCtm64D8M1jFRrruh+HaQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.75]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MRCOK-1lYA381FH2-00NCij for ; Sat, 13 Feb 2021 18:40:14 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sat, 13 Feb 2021 18:40:08 +0100 Message-Id: <20210213174013.32584-2-ps.report@gmx.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210213174013.32584-1-ps.report@gmx.net> References: <20210213174013.32584-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:P2dgoA9NaaylmMtVcS0dGqcJ3VRusONZYNB1PPfCTVoT2fHTKDJ M6gBWQK0fudUK7icOOuhxXjEmbPZMCqrDSg5Xl2fcAlPJcOTz1vxnTKU5II49i+U9vhdQAO iQ9o3E0Tp/3yRDb8jVsNbyn1xexF6K1ufRo7gLspQtJm5X0UOgOQMlS9K3x3ZT/nmjP+snb jIpNSFb0rbcH6sE235g7g== X-UI-Out-Filterresults: notjunk:1;V03:K0:BM3dKluDMJQ=:TObSkCABcgJXkGMdMXDTtW C5rwyGIW9Q2R2b57Jd/9W3h1SgtyWG7voBkMn3nQH04SVQBg4QPs2iiwEMLS+gjlSlUbLYA6/ 6LU5MAMEZBMJavdb7ei8dFlU5VZYaW0zvDh9pks0p1oUL3ugcAm4+grGPrExvgF6k/G5ZBNLV lz0elDus5DVWYjNSFlGh2qXb4MSKWBhVY00TjmKgG/Z8lRYrNU5pBqIzYlgeXdsa7kwh4WkcB IURkOdPBV0P1N+PpSnpXjnO5tCaCB0N2NC9CrDh07hFR6wEO4Pkdj7dFvPFrftLzKXSm2f0nI lPNPTihGW+lEPaETtx6kiIGR0M2KSku515c7OP1/ZwA9nKDBTox/K19Rg7FJbQt1/Iug74TZU +QYXZ/THnxHe/vWGCILpvDv7VaLKXVD4bsKPgEB6XP5m7Oohb1huCClBwJGiP1k63Y18jyiHk wnZ9AerDNIi2j5B/ceyTqOSo9XwR1byrjwPWAIc7F0Iu+IPxI45FhBPSP+J+bYKsOZT/4mzaY xU6WO8Tm3bAsf4wmkg3kZM1mLMI4trUqPqDKsGTs+yfCyD1u/x1pezGCKFeHelN92FtiQev9N sacA6An/wowa4A7XSO3bw/it+t49jxnSu43W72YSx9un3i/qlweV+T2D7tejQ0Im3hv3HmzHK XfSlO1PJoMmci2ys3oBJpTrE8i58jvr6FB+j0D8Sbu0Mar7fzHn4LnCzo9K1EWN8/bVHF/zuD X91KOtfN8f9UeSGjPETYWoy49irj2Voeo5KewxwM1vlpj6pq7OPu0k6xvmWWgnb/XPRZOllu8 ATkUEIcp4HQQ4u08Rae5MQoUjgIDjZQG5u/iHohX822KKbcucrkQn6ffiRf4lRIVVSbjdN3oI 3LcdxmPexoCb8blEgGrA== Subject: [Buildroot] [RFC v1 1/6] package/libb2: new package 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Seiderer --- package/Config.in | 1 + package/libb2/Config.in | 6 ++++++ package/libb2/libb2.hash | 3 +++ package/libb2/libb2.mk | 16 ++++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/libb2/Config.in create mode 100644 package/libb2/libb2.hash create mode 100644 package/libb2/libb2.mk diff --git a/package/Config.in b/package/Config.in index 5304ab141c..fab4dcab89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1353,6 +1353,7 @@ menu "Crypto" source "package/gnutls/Config.in" source "package/libargon2/Config.in" source "package/libassuan/Config.in" + source "package/libb2/Config.in" source "package/libgcrypt/Config.in" source "package/libgpg-error/Config.in" source "package/libgpgme/Config.in" diff --git a/package/libb2/Config.in b/package/libb2/Config.in new file mode 100644 index 0000000000..5cb462eb19 --- /dev/null +++ b/package/libb2/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBB2 + bool "libb2" + help + C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp. + + https://github.com/BLAKE2/libb2 diff --git a/package/libb2/libb2.hash b/package/libb2/libb2.hash new file mode 100644 index 0000000000..6ef24a98ca --- /dev/null +++ b/package/libb2/libb2.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 10053dbc2fa342516b780a6bbf6e7b2a2360b8d49c5ac426936bf3df82526732 libb2-0.98.1.tar.gz +sha256 6a1ee543e5282cd9061881edf462e6fdab181f328da71fc2c9a6950a80e94d01 COPYING diff --git a/package/libb2/libb2.mk b/package/libb2/libb2.mk new file mode 100644 index 0000000000..11d7ef3f55 --- /dev/null +++ b/package/libb2/libb2.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libb2 +# +################################################################################ + +LIBB2_VERSION = 0.98.1 +LIBB2_SITE = $(call github,BLAKE2,libb2,v$(LIBB2_VERSION)) +LIBB2_LICENSE = CC0-1.0 +LIBB2_LICENSE_FILES = COPYING +LIBB2_INSTALL_STAGING = YES +# From git +LIBB2_AUTORECONF = YES +LIBB2_DEPENDENCIES = host-pkgconf + +$(eval $(autotools-package)) From patchwork Sat Feb 13 17:40:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1440239 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; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=bqzIQMLy; 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 4DdHh63NVCz9sRN for ; Sun, 14 Feb 2021 04:40:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0DD9485A9E; Sat, 13 Feb 2021 17:40:21 +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 AqUSHcw492M5; Sat, 13 Feb 2021 17:40:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5483A8593F; Sat, 13 Feb 2021 17:40:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5A0B81BF2F6 for ; Sat, 13 Feb 2021 17:40:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 55F7686A6A for ; Sat, 13 Feb 2021 17:40:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 88uaSmUsjEV8 for ; Sat, 13 Feb 2021 17:40:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by whitealder.osuosl.org (Postfix) with ESMTPS id BFB6286A3C for ; Sat, 13 Feb 2021 17:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1613238014; bh=8MuOLUfYpUKlCwRVZi6N1TQq0s4uKE1DrAzPsgkTtUA=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=bqzIQMLyD4R2UzL2OznpfeeVyqkBu5w+sg+orVSOvcLelw0xMWIZ9r9uhBn3tZoIU QeCUyrpf41zRO7Foyx0gaDkAv7Tf6m2b+5ZOLq0ReJeJksy2sjLXQMUHytzNPvX0/I vRzrYW7basM/0M0aR9Q+/1otUTx0B9a6HF2X8QSQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.75]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MxDou-1m4Bwk1ubA-00xeWv for ; Sat, 13 Feb 2021 18:40:14 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sat, 13 Feb 2021 18:40:09 +0100 Message-Id: <20210213174013.32584-3-ps.report@gmx.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210213174013.32584-1-ps.report@gmx.net> References: <20210213174013.32584-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:N3KXznXC3XFp8kyz6UelIU5M/sN0iu/erw5AEtekmlrBmE3NIHB w2/aDXiEQbVWWawRU7QPwOMHIwR1V4qhhvcqXe0ZoEuYYkTDZQzw8EVIDPliZPxYf7c3v4j LpD2/uDp7977JUOCZCUw5pjEkHeC8HvwAClHd37oASc9u5m8dmqTozBahSsvk5Jr0Mo1Xuf 69qN2xU6oGFMH7/6g4VUQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:IfnsudZgJEk=:eLgiWuTz/rlDq4SSkKy5tO PgnEFo5AxPCzKtbMJnCjagV+ri1iIRsS0vWl1AVnnA760iZB7yOG5BdaZE3SS8pbsnb1amb0T btK116LEcjllsrO1SrJl7i7rVzSDXN3imFuJ8jjajelfxQfePOVhsyEejhc+WAk+CVRyZRaog uZFUd/wUhHsPzQ6rTEQGq9okZEIkviNRqnYE1HFNmtu7qMVUeoMy0Wsr/EpIFbkcNP20SMa9+ 52efOrv91wP1iEsaxr90h1YDeeY7qAWdTd7TVNAHBStxytGgHOTbeRwG3pg0Lxur+7LEmwad1 5awVVew2yoBm03k1MQQSQHM0x1ppqc+9JMiPkYmKzDa31iDV850prPjISJDqmd78EHWjh8/EY K+QEIoteiruse4qibPakcRXY9mrvwBpd2enxANL/Q2u9U+icA3z8DAqNobiHnvfceHaPfTRp9 j9J5j5XG9pCeZAtD9HfB2m0oFwIfwPRkNCZIodpHlwD5E86C9K07dTgzjLu7ZaRBWiug9Vcd7 rNlGQCcVmHd6FB40yszv7i7ZjrResvEkYAGveHZT4W6R2Zk4m6Ph4MEo4zOen7pk1094r4lio 5AZljVJnRaEeySJwj4ZHub4ZarAKEFZgloP/h3IPs6s/BlTHuAKM1joWeOYy0eVni2EG0laCT RqiZPiVWmTDvfxcb0PjCBMar/1fgjLYsNpPcSazB+DMEKGfdLD1Xh9qXl6Nb6zVmSbg2bfDGA VkijcjiRAUeby/8FTeEbVT1jGO1DD9sZQ8k8QFe6bPhrgb6gxKK16ZNrGjPx3rTi3WwLzlfJZ aS3fteAH4VJpRagX1itccfi1YXqdD+L+E4u4cD1a+xLxGGUNmEm5lOeiE0Wh0lSY8MQQNpsMG GJSS7fN2ftvlu+cufzSA== Subject: [Buildroot] [RFC v1 2/6] package/libb2/libb2.mk: fix cross-compile/runtime detection 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Seiderer --- Notes: - squash with previous patch and add proper failure/fix description --- package/libb2/libb2.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libb2/libb2.mk b/package/libb2/libb2.mk index 11d7ef3f55..d5963263f4 100644 --- a/package/libb2/libb2.mk +++ b/package/libb2/libb2.mk @@ -12,5 +12,7 @@ LIBB2_INSTALL_STAGING = YES # From git LIBB2_AUTORECONF = YES LIBB2_DEPENDENCIES = host-pkgconf - +# disable failing cross-compiling/runtime detection +LIBB2_CONF_ENV = ax_cv_have_ssse3_ex=no +LIBB2_CONF_OPTS = --enable-fat=no --enable-native=no $(eval $(autotools-package)) From patchwork Sat Feb 13 17:40:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1440241 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; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=dtsYmdbA; dkim-atps=neutral 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 4DdHhD5kf9z9sRN for ; Sun, 14 Feb 2021 04:40:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7DB6A87120; Sat, 13 Feb 2021 17:40:23 +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 ZJMYJJyXhOBH; Sat, 13 Feb 2021 17:40:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7930E8714C; Sat, 13 Feb 2021 17:40:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 774471BF8C7 for ; Sat, 13 Feb 2021 17:40:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 71CFC86A3C for ; Sat, 13 Feb 2021 17:40:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YJywpsp1IUn2 for ; Sat, 13 Feb 2021 17:40:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id A1E9B86963 for ; Sat, 13 Feb 2021 17:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1613238014; bh=akzzsfEywagBB6mSDIqUlh21FSsO//VhBXhf9a+iVOQ=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=dtsYmdbAThk95JpPyb0Pu1inPw0YUY7psmVN+/+nbKvEbdrH8UqE1Mvb9sokJDbnh IrwsvzJ7ABBEgz0vX28BH8LK7GocGvBCqNj504sACHOhZyqOFNe5LpnH/T8KwqifY9 S78Gul8H2ZaYe0qr43zDGoY9lCgNuPGasRzAnQVE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.75]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MBm1U-1l16Sg2kxw-00C7xl for ; Sat, 13 Feb 2021 18:40:14 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sat, 13 Feb 2021 18:40:10 +0100 Message-Id: <20210213174013.32584-4-ps.report@gmx.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210213174013.32584-1-ps.report@gmx.net> References: <20210213174013.32584-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:d1LjZYjGwqekzFQtkTFdd3HF5xaVJBaPzeLEmhXkgIPbh7dLcb/ Qbi7M03nUvYz/w4BiRjeq7E63MJEFe8KUENYWjeqyHMxIptq0BgPAM+Mr4LL94QpkD7amMg 6vjnNkppAl8S7W26y/dC3c1VBmw3nVGVHl3hH4NUgtFReW5vgOVh0sVY3al8YjzHkN5NyNx 7+4iihfFnoGANwLIRO0BQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:xI1NpnhHXEE=:UM4NguFVHRlqOQaFOWz7Hy +pqyrldb3WJz20PNWriQYm938ih5gw1x3j+chgaL8xCYiSveKPRPyX4/GjE3XGPCEy5ck99Hf BPDCXpEaacRZ1UHdMGzVIad+XBbltVcksrHoVGPUQ4mfnyUgE9VFZLOnO7F4fz+ir+CNwKoda n1YacKyfBwO4mO6kP/WVqNDiIHKRheMsl2TPfmsz9x603xqD8B3LQaW70/vIh82Fsn9Z+tHSR i9c9+KWXYO7CNRpsaIxPgdJ8a/zh0XfljL2IuR7Uf08xagFf1sqWBZfqIagxE4EKrY4RXo3L8 OwjLC60pLj/9rpNZNH+W7oTFchZzfKZDjIhLMmlz0FkSjsZCSTzw0hGqjB5/HLW9RaJmmIJQF XwH6scFu53XoHPFSEdpqG1S6Ped1FWT3/wD1jM0pDh5YULSxKl59NXAu3OGX+fck9LzOtPeUN 1uDTPOw6bqTCsI5yfSTQZhffs1hmVqqAtpGpPwRqKqwmG18BBI8oYaYDaPE+FnJvUTxhCwcnY e/s/aZa81y2Un8Un1sj2H56VOSDx5MUCu74ij+OO/YFkER4W0qye3cdwqRrMtJT7bChcMp94o 0eQV6SfcRv8jHk2+0891idyg2G1ULPvPUpcLJ7v6r3lV9bPZRYy1wCmFfoD4DwWeDlPpj/hf7 lQUxkp3aoQBTH6B+G8EKrvgH8oujIgy61h0r7uJ0cZYzZH6YIVb73TnU5mdFCEPOdP/5ceg2k gz+MgH1bpbTmEBs09qb0pvSkYg65//s22pygUnyr/NF1l6D1FHZOS3ASY9caCOd/PPoKapU1K YD9beqeRBGFmcc0x2sH96v9zhylnwx2paHO7+q0G0YfG1Dc85dtfaagIJ/+ucfzJeYJszaMF5 FqssajFfb+M6wxT3jadQ== Subject: [Buildroot] [RFC v1 3/6] package/double-conversion: new package 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Seiderer --- package/Config.in | 1 + package/double-conversion/Config.in | 14 ++++++++++++++ package/double-conversion/double-conversion.hash | 3 +++ package/double-conversion/double-conversion.mk | 13 +++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/double-conversion/Config.in create mode 100644 package/double-conversion/double-conversion.hash create mode 100644 package/double-conversion/double-conversion.mk diff --git a/package/Config.in b/package/Config.in index fab4dcab89..1ddd47f50a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1861,6 +1861,7 @@ menu "Other" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" + source "package/double-conversion/Config.in" source "package/eigen/Config.in" source "package/elfutils/Config.in" source "package/ell/Config.in" diff --git a/package/double-conversion/Config.in b/package/double-conversion/Config.in new file mode 100644 index 0000000000..8c590fbde6 --- /dev/null +++ b/package/double-conversion/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_DOUBLE_CONVERSION + bool "double-conversion" + # note: BR2_microblazeel/BR2_nios2/BR2_xtensa was added post v3.1.5 already + depends on !BR2_nds32 && !BR2_microblazeel && !BR2_nios2 + depends on !BR2_xtensa + depends on BR2_INSTALL_LIBSTDCPP + help + Provides binary-decimal and decimal-binary routines for + IEEE doubles. + + https://github.com/google/double-conversion + +comment "double-conversion needs a toolchian w/ C++ + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/double-conversion/double-conversion.hash b/package/double-conversion/double-conversion.hash new file mode 100644 index 0000000000..65411a8982 --- /dev/null +++ b/package/double-conversion/double-conversion.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13 double-conversion-3.1.5.tar.gz +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca COPYING diff --git a/package/double-conversion/double-conversion.mk b/package/double-conversion/double-conversion.mk new file mode 100644 index 0000000000..c8db5104f0 --- /dev/null +++ b/package/double-conversion/double-conversion.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# double-conversion +# +################################################################################ + +DOUBLE_CONVERSION_VERSION = 3.1.5 +DOUBLE_CONVERSION_SITE = $(call github,google,double-conversion,v$(DOUBLE_CONVERSION_VERSION)) +DOUBLE_CONVERSION_LICENSE = BSD-3-Clause +DOUBLE_CONVERSION_LICENSE_FILES = COPYING +DOUBLE_CONVERSION_INSTALL_STAGING = YES + +$(eval $(cmake-package)) From patchwork Sat Feb 13 17:40:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1440242 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; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=j8kO1liJ; dkim-atps=neutral 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 4DdHhF1JBBz9sS8 for ; Sun, 14 Feb 2021 04:40:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9E26A8714C; Sat, 13 Feb 2021 17:40:23 +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 GdvTuTSpufaO; Sat, 13 Feb 2021 17:40:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B89AB872A0; Sat, 13 Feb 2021 17:40:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E55F61BF2F6 for ; Sat, 13 Feb 2021 17:40:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E23A686963 for ; Sat, 13 Feb 2021 17:40:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id feDmB6i8K0o6 for ; Sat, 13 Feb 2021 17:40:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by whitealder.osuosl.org (Postfix) with ESMTPS id C082786A4D for ; Sat, 13 Feb 2021 17:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1613238015; bh=wx6xprTqnpyeZL/pJgKA/F96Gym1SA5OMhwnwvYI0c0=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=j8kO1liJ0vdNBqu54hsAcKujlp4AfwhGnYj5W1sUj4xpCTxbo42VYroedSi51oaRU AkBFeIRbp/4l+S5opqmRMKM/sUKVTZCnWxtwcwwAegv3if3UGu/NQiEjgqTechUx7K JR9nLo7tlKs9nVRiziPR/lOks+NCFOvGV6K3vpOk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.75]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N8XPt-1lxuXv3Q6j-014U24 for ; Sat, 13 Feb 2021 18:40:14 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sat, 13 Feb 2021 18:40:11 +0100 Message-Id: <20210213174013.32584-5-ps.report@gmx.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210213174013.32584-1-ps.report@gmx.net> References: <20210213174013.32584-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:iRJudSAib7uRsYbB+0juNeX6EGW7aZnsvqeSpkb3CI8cDY6Ldsl EZka6lGGcHrLikqP7AqAJEnwCCWgscNPhvDqMoVn0LTkdaqd4atj3eiNWrLZnsfBeP907fi sI6PkGSFu8V8OyOFEbaIeiaBh9GIGReRk5veGkh5krc1mkLoHHdL3I35MZa9ZByCrGpTPS9 huV9waYdBu6o6NBNEMOXg== X-UI-Out-Filterresults: notjunk:1;V03:K0:4d2dS1/yMQY=:ycR4M3vRhM0sxOFfkyvgmO SJWklZ7MZ5DFwZghjWr1EHF29bhLg13lOEoUxxeTTPQ4q83Tw0b7D8JT3YH8gSmw4H/p2cESo nloLKd9vdCQim1Ia6BnGLHYMSu4DtiRtmDrXD+iFvr3vBik/cfBRRXFDWhE64adK2Z3g4Ib8C T1irGU1mriewcBMEkJCx2vPqdzreGm3KInXyURroh8MzOgaDiB7rfZt51bf6/znthJmL1IXjt v4Lwk/XwM0GhsAtJV6w8YZiAbDpb000SeUOpU7LQxLkmxwENj/RzSrnIMv/gGDHVCql8Nu6NY MzZStSzt6bn7mr2RqpUwOYzDwTtX1sfkozEe7/axxhmNjNtk51KeVweBmaS3XgS9b+YFyf4lG 96tYEDoH03Hf9km/QKbmlt7qpfDzG9+eondV7BMV7A2k8Gs3jol0QlkM0KVJbum1qXIfG+nuL ZJLv3bGg9rDy5x8QckSgFRdGMtVSVkTSir7614FGYeZtUOsAeUYFvG4SGzhw0Yns6JB0WwXkg m69raSmIvX2cYIohPxAHAlnJTXy2Jja14Tu2Nq71Fqg5pL1rq6YfEW3M+NeHN9z2fa3ut+qR/ MUsv7WxkKluUyxPZGmJrwtrXPhUWhaLcAqGuo0X7Se17XhStc529Z4IUxSeADNQG0Bak5eENa XH7WNTbXXh9pRKygeHtRli3NBAGTX92nnycGKkTIXN403SYvRPz22gZgteTnXeQJPWuqFXbAG nJl/NP5DrL2rLCwh3DBkglohcISUi4bscQmaprdEGr1oCyP1axI8SldIRJfqWwXNOqHUXOlCF v1RB5X+cRIKnUXTEKkvxi2OExryuQP0u4Q6OVvHCm+YTeLspZFUkGSXtNUcCNOTL1k3U8eRsS mIKK5P+p9/TtR43Hwj4g== Subject: [Buildroot] [RFC v1 4/6] package/double-conversion: bump version to 3c6d2c2 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Seiderer --- Notes: - squash with previous patch - fix the remaining BR2_nds32 case --- package/double-conversion/Config.in | 4 +--- package/double-conversion/double-conversion.hash | 2 +- package/double-conversion/double-conversion.mk | 6 ++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/double-conversion/Config.in b/package/double-conversion/Config.in index 8c590fbde6..cab6192357 100644 --- a/package/double-conversion/Config.in +++ b/package/double-conversion/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_DOUBLE_CONVERSION bool "double-conversion" - # note: BR2_microblazeel/BR2_nios2/BR2_xtensa was added post v3.1.5 already - depends on !BR2_nds32 && !BR2_microblazeel && !BR2_nios2 - depends on !BR2_xtensa + depends on !BR2_nds32 depends on BR2_INSTALL_LIBSTDCPP help Provides binary-decimal and decimal-binary routines for diff --git a/package/double-conversion/double-conversion.hash b/package/double-conversion/double-conversion.hash index 65411a8982..fa5e3480da 100644 --- a/package/double-conversion/double-conversion.hash +++ b/package/double-conversion/double-conversion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13 double-conversion-3.1.5.tar.gz +sha256 025e4cd3f02408df4fe8a6a0526bea69b4bc9c5536bd37dadcecec7aad568593 double-conversion-3c6d2c2ec99340bf05aa0fef7842bbaf6af4d830.tar.gz sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca COPYING diff --git a/package/double-conversion/double-conversion.mk b/package/double-conversion/double-conversion.mk index c8db5104f0..df74f5936d 100644 --- a/package/double-conversion/double-conversion.mk +++ b/package/double-conversion/double-conversion.mk @@ -4,8 +4,10 @@ # ################################################################################ -DOUBLE_CONVERSION_VERSION = 3.1.5 -DOUBLE_CONVERSION_SITE = $(call github,google,double-conversion,v$(DOUBLE_CONVERSION_VERSION)) +# use git latest instead of lat release v3.1.5 to enable additioanal +# cpu archs +DOUBLE_CONVERSION_VERSION = 3c6d2c2ec99340bf05aa0fef7842bbaf6af4d830 +DOUBLE_CONVERSION_SITE = $(call github,google,double-conversion,$(DOUBLE_CONVERSION_VERSION)) DOUBLE_CONVERSION_LICENSE = BSD-3-Clause DOUBLE_CONVERSION_LICENSE_FILES = COPYING DOUBLE_CONVERSION_INSTALL_STAGING = YES From patchwork Sat Feb 13 17:40:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1440244 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; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=aeKX8hYp; 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 4DdHhJ4YRQz9sRN for ; Sun, 14 Feb 2021 04:40:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 27DD485B94; Sat, 13 Feb 2021 17:40:31 +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 d2pEJQ86Mm5n; Sat, 13 Feb 2021 17:40:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 988D885F29; Sat, 13 Feb 2021 17:40:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B7D671BF2F6 for ; Sat, 13 Feb 2021 17:40:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B488286963 for ; Sat, 13 Feb 2021 17:40:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z4DZQLHB1Y37 for ; Sat, 13 Feb 2021 17:40:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id BB2CB869EC for ; Sat, 13 Feb 2021 17:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1613238015; bh=t/wi6pywmgmMPoq6buGPQxXa+hCV3dHfbmlnIsi+oTk=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=aeKX8hYpv6ceGr+QILQXcI3W4WIEly53JAYiRTEjeZhDpJgtFNLDBEr1xNyk2xPuK jmM1zEHw2jTTixghC9TS+vtH7Qth+kbWMWwcCg5B+x38h+LSflzM2kk6/3WE2590/X A71oYt/pA3QC6BhMD15WEq/Sra56mi9/BIPcqa1Y= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.75]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MV67y-1lLWjA44Qg-00S8Pn for ; Sat, 13 Feb 2021 18:40:15 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sat, 13 Feb 2021 18:40:12 +0100 Message-Id: <20210213174013.32584-6-ps.report@gmx.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210213174013.32584-1-ps.report@gmx.net> References: <20210213174013.32584-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:N2rf+Hl/h+U7wswU8J/i2S2EAuSeWAskIg3Af0e/eUEdguDRP0H 4glt8v5NwsUukYG7lYI2kcv3VJb0o8+dHN6noprqicxu0K8X2QOxvcBLYwErHIpl8l5Yffj xKCOTGn9e4t4Ba3RzX2/XLLnZmO/2ZU9tJ6kuoAKruWqEKyjK1QmAMyDxXKhao8AMfPLqVJ FlEpA72A7M4pl7cTmuzSQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:TNJ7tOi4N+Y=:+PCGEx4O4FqAvFIdEBdzMO qs4Qb4NBipAY9vzn/n+dPn+BonMQqodensV4/YwSOvpmr+F2wdzzsqqyw/lfo9ukMgN7lwll4 H8C2NYc903JldEpEOlcBPH1LmSeAoYqp0Ae1xlF/v1gpgM0A0zolBICeF505t0FuTaNDOf46W Xg3GIs8hzoh2vol+j3CxdZKFatLinZ++dVgeq+JONQUEFQSX75xFli/A4SVCyBK/3i84nrRkD USM8qPUAMNs7yG1pZugk2FQSnCsDX3FKq9kpGfaqOS4vQi0WKdER0A7EQqyhXH3geixngHXxH XTP1L8wVRMfQB6WgQBmf/IwRmb0KUTX99E267ZM8DAM+YEhxwxzRRYxT9xyuiKyU1b0Ncx/aQ uRgPzuXItMIwhTOMaFprgSVhVJKqCesvcCyf7Nd+UDR/27N+Ezywkhy0Y3IOX68dgwKyXXpDl URUugZHsKM62JNiDWMWEjJ5gy4+I46QUXQ7oPDKQLdlktG48TAMbfeqpBj0lge88FCcsVUVJS bG09aGqTHN/mQZIxnedt6E4Z4kU+cdi5NMqc8EZdUk+av1/+mDCYGAPXadLXR2AldYWlCJbWl kPdHM/Dvw8xqLBnY1qyc3y0A3azVybfBWEB/mwbshmgR8VMh5gn7lPogOonRODAzQC9CeARhY aXc2a52ir0ASh7/3uF73FY2Q4z4j9/kekuw9iBySXGxg5fcaQYNMaLWyr4+TN0r9z+FLyEv8h pWjDI0DoXWeEGgO1bVLoq9O5ngelc9ER5Mbks0qBO6+nWOaYQfdQkJ2LMxJeb0wh3vZEIL37M Y74iCJ/QXLNopO/ie3Y2Bh8UN9qJEwjswH7OOO5f0V9FHHT8eIuRRu4lZDQXiptxlyqAi4fj/ YiDvVqx6AebvmzUAVmYA== Subject: [Buildroot] [RFC v1 5/6] package/pkg-cmake: add _INSTALL_STAGING_ENV/_INSTALL_TARGET_ENV 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add _INSTALL_STAGING_ENV/_INSTALL_TARGET_ENV as needed for ninja make/install as ninja expects the DESDIR as eviornment var instead of parameter. This one makes ninja unhappy: $ ninja install DESTDIR=... This one makes ninja happy: $ DESTDIR=... ninja install Signed-off-by: Peter Seiderer --- ToDo: - add documentation Notes: - alternative to explicit make/ninja calls maybe common 'cmake --build'/'cmake --install' calls are a feasible solution (yet untested) - pro: more common code, con: less customizable, needs to take a look at the current users of _MAKE/_INSTALL_STAGING_OPTS/_INSTALL_TARGET_OPTS options --- package/pkg-cmake.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index c001051002..b758e50b76 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -58,7 +58,10 @@ $(2)_MAKE_ENV ?= $(2)_MAKE_OPTS ?= $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast +$(2)_INSTALL_STAGING_ENV ?= $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast +$(2)_INSTALL_TARGET_ENV ?= + $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -192,7 +195,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_INSTALL_STAGING_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif @@ -202,7 +205,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_INSTALL_TARGET_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif From patchwork Sat Feb 13 17:40:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1440245 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.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=d1G9fnfo; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DdHhz0lD2z9sRN for ; Sun, 14 Feb 2021 04:41:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1EEA96F539 for ; Sat, 13 Feb 2021 17:41:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TXt5Apet0Xpg for ; Sat, 13 Feb 2021 17:40:58 +0000 (UTC) Received: by smtp3.osuosl.org (Postfix, from userid 1001) id F28EC6F5C1; Sat, 13 Feb 2021 17:40:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id D09B36F4FB; Sat, 13 Feb 2021 17:40:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id ACD301BF2F6 for ; Sat, 13 Feb 2021 17:40:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9E635868CB for ; Sat, 13 Feb 2021 17:40:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SW1DdcS7gBfR for ; Sat, 13 Feb 2021 17:40:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2444586A64 for ; Sat, 13 Feb 2021 17:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1613238015; bh=eLOb2w0RgY/m6Sd5OM6aRoOjdrrZBoIV8RZTWy2SIT4=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=d1G9fnfoUfxZZnEt4Ii7PLbShqSPNDLJEai3DabzzQldEDI9jb8Dcj3F9PUJ/ATPH UImVbDAvmuBgMGddbQRCutRT3ZVmULmVPQFB4OgkublrFGDTJUU4ap7CByZ8aia7eX DQCx2eXZS3obFbM/wWnQlgckMnl+lNJiKyAQ/0EU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.75]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MOREc-1lWV5V0Yv8-00Pxbj for ; Sat, 13 Feb 2021 18:40:15 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sat, 13 Feb 2021 18:40:13 +0100 Message-Id: <20210213174013.32584-7-ps.report@gmx.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210213174013.32584-1-ps.report@gmx.net> References: <20210213174013.32584-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:9d810znUXU09adwdr+xXQJEOYy15hsV7IdfZ1My7XnXRcFRJsv6 FyCjk5nKQ9Ph+MDEv3bdun+tvFltGLOv+ToPQVf4o2PcBjAIDjF4rYbGSHkpecmfRN1aO0p LoQwCH0o0Bmmok/LGplUY8rsrLeGX3xCJHV9bpJ1ja6I6pl2TfPvU1c1T7q9Y6TUpRxKqv2 QIGc2YT+3Esmrd9uv09Nw== X-UI-Out-Filterresults: notjunk:1;V03:K0:btnJY2S/yuQ=:EB9nAXJkQsUlu5DUACqXja L4tCk/ilHc7X+PyqUGXS1Wu8B8XhP00lvYzyeY6EPH6lbnUKgdsE5PRNwvT2c/tMjoYBMmh4c U0aYP6kcQi1IcwsAoK3U3jFvy47W7q/Ca2BQ9lq0c7LpWKkCEVDWjxPPlbVyQRqjYj1uzTUEZ zg1ugIqn3kWuBMEEvEA3SNLfbKNfe41fry9K550YodTT+i6sQ7dtl3liy20hfuFg56N82SA9V SbhAh7D3rktDFBwdHOIF2syGm5Anqh/8Ve8/XhKDdxpNd7snwuqyrDsPy2D+3l1h9q80UU5jL napYG7JrN4RkLePGHVLFqYBjASHgTNW9SWmrpwAX31VQdRSYuZNfgc2VBk54d/GjP8aTbLYae OlYEtf1zYg1LsbssBMTwNEtr6WpcvYSbi6x/JnEqH1bVnmVIyRTduBunxcudrjpzwWdI9nTsx aaa6flKx/GhtwuZMmbdpz05Y206t3txL9pJWZXSNNtyYXsSFuHDVsi8uSUebi5L4dIw9IcHjQ pQrN9QQB10MUSOhPD3/sBzCxuiubTZ4hQLuMrvvKLO1uiZAm5FcTR5kSzFz//6+y+UQCPRL7X B+HBd03rNqFvLUlrnyoUKMyNWr5hrv73wmlP8Frj4CmcjO8OnYtOa4YpLoBTnyT/Y7V1Z+8MN YZcoWM6mkexGZ/N0FzSLA43J1ls7/OxrtIvziCP+Fo4CUc0i5CiAu5S88aV3uqw0yADR2e3yE YJoxy/D9IlzTaQkuWZCu/JRzPPaiEtRP0B+DBOihxnwE6Ru3B0Y/pQHUGGXhKUKJYVjc58ucc uBg/6aAOGBwlJRpYtbVtJMKmpegefLdAC4lAHHlFj2QfARDxqQVeGu6xSVr1/9WG/Pc1JMvD+ HNPHCzqTMjvM3O1QCo7w== Subject: [Buildroot] [RFC v1 6/6] package/qt6: new package 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" --- package/Config.in | 1 + package/qt6/Config.in | 75 +++ package/qt6/qt6.mk | 12 + ...disable-global-minimum-linux-support.patch | 55 ++ ...-failure-with-multiline-toolchain-fi.patch | 48 ++ package/qt6/qt6base/Config.in | 311 +++++++++++ package/qt6/qt6base/qt6base.hash | 10 + package/qt6/qt6base/qt6base.mk | 496 ++++++++++++++++++ 8 files changed, 1008 insertions(+) create mode 100644 package/qt6/Config.in create mode 100644 package/qt6/qt6.mk create mode 100644 package/qt6/qt6base/0001-src-corelib-disable-global-minimum-linux-support.patch create mode 100644 package/qt6/qt6base/0002-QtAutoDetect-fix-failure-with-multiline-toolchain-fi.patch create mode 100644 package/qt6/qt6base/Config.in create mode 100644 package/qt6/qt6base/qt6base.hash create mode 100644 package/qt6/qt6base/qt6base.mk diff --git a/package/Config.in b/package/Config.in index 1ddd47f50a..9e012bafc4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -354,6 +354,7 @@ comment "QT libraries and helper libraries" source "package/quazip/Config.in" source "package/qwt/Config.in" endif + source "package/qt6/Config.in" source "package/tekui/Config.in" source "package/weston/Config.in" source "package/x11r7/Config.in" diff --git a/package/qt6/Config.in b/package/qt6/Config.in new file mode 100644 index 0000000000..5e3891dfcd --- /dev/null +++ b/package/qt6/Config.in @@ -0,0 +1,75 @@ +#config BR2_PACKAGE_QT6_GL_AVAILABLE +# bool +# default y +# depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + +#config BR2_PACKAGE_QT6_JSCORE_AVAILABLE +# bool +# default y +# # Javascript engine is only available on certain architectures +# depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel +# # ARM needs BLX, so v5t+ +# depends on !BR2_ARM_CPU_ARMV4 + +comment "Qt6 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" + depends on !BR2_ARM_CPU_ARMV4 + depends on !BR2_arc + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + +menuconfig BR2_PACKAGE_QT6 + bool "Qt6" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 + depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ + # no built-in double-conversion support + depends on !BR2_arc + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_QT6BASE + help + This option enables the Qt6 framework. Sub-options allow to + select which modules should be built. + + http://qt.io + +if BR2_PACKAGE_QT6 +#source "package/qt6/qt63d/Config.in" +source "package/qt6/qt6base/Config.in" +#source "package/qt6/qt6charts/Config.in" +#source "package/qt6/qt6coap/Config.in" +#source "package/qt6/qt6connectivity/Config.in" +#source "package/qt6/qt6declarative/Config.in" +#source "package/qt6/qt6enginio/Config.in" +#source "package/qt6/qt6graphicaleffects/Config.in" +#source "package/qt6/qt6imageformats/Config.in" +#source "package/qt6/qt6knx/Config.in" +#source "package/qt6/qt6location/Config.in" +#source "package/qt6/qt6lottie/Config.in" +#source "package/qt6/qt6mqtt/Config.in" +#source "package/qt6/qt6multimedia/Config.in" +#source "package/qt6/qt6quickcontrols/Config.in" +#source "package/qt6/qt6quickcontrols2/Config.in" +#source "package/qt6/qt6quicktimeline/Config.in" +#source "package/qt6/qt6remoteobjects/Config.in" +#source "package/qt6/qt6script/Config.in" +#source "package/qt6/qt6scxml/Config.in" +#source "package/qt6/qt6sensors/Config.in" +#source "package/qt6/qt6serialbus/Config.in" +#source "package/qt6/qt6serialport/Config.in" +#source "package/qt6/qt6svg/Config.in" +#source "package/qt6/qt6tools/Config.in" +#source "package/qt6/qt6virtualkeyboard/Config.in" +#source "package/qt6/qt6wayland/Config.in" +#source "package/qt6/qt6webchannel/Config.in" +#source "package/qt6/qt6webkit/Config.in" +#source "package/qt6/qt6webkit-examples/Config.in" +#source "package/qt6/qt6webengine/Config.in" +#source "package/qt6/qt6websockets/Config.in" +#source "package/qt6/qt6webview/Config.in" +#source "package/qt6/qt6x11extras/Config.in" +#source "package/qt6/qt6xmlpatterns/Config.in" +endif diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk new file mode 100644 index 0000000000..b586e65c7b --- /dev/null +++ b/package/qt6/qt6.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# qt6 +# +################################################################################ + +QT6_VERSION_MAJOR = 6.0 +QT6_VERSION = $(QT6_VERSION_MAJOR).1 +QT6_SOURCE_TARBALL_PREFIX = everywhere-src +QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules + +include $(sort $(wildcard package/qt6/*/*.mk)) diff --git a/package/qt6/qt6base/0001-src-corelib-disable-global-minimum-linux-support.patch b/package/qt6/qt6base/0001-src-corelib-disable-global-minimum-linux-support.patch new file mode 100644 index 0000000000..18192096dc --- /dev/null +++ b/package/qt6/qt6base/0001-src-corelib-disable-global-minimum-linux-support.patch @@ -0,0 +1,55 @@ +From 7ded1e6fe89b6593ea0e6fb5dfeffef5385bd3ac Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 11 Dec 2020 22:26:16 +0100 +Subject: [PATCH] src/corelib: disable global/minimum-linux support + +Fixes: + + [433/575] Building ASM object src/corelib/CMakeFiles/Core.dir/global/minimum-linux.S.o + FAILED: src/corelib/CMakeFiles/Core.dir/global/minimum-linux.S.o + /usr/bin/as --defsym Core_EXPORTS --defsym ELF_INTERPRETER=\"/lib64/ld-linux-x86-64.so.2\" --defsym PCRE2_CODE_UNIT_WIDTH=16 --defsym QT_ASCII_CAST_WARNINGS --defsym QT_BUILDING_QT --defsym QT_BUILD_CORE_LIB --defsym QT_CORE_QOBJECT_LIB --defsym QT_DEPRECATED_WARNINGS --defsym QT_DEPRECATED_WARNINGS_SINCE=0x060000 --defsym QT_DISABLE_DEPRECATED_BEFORE=0x050000 --defsym QT_MOC_COMPAT --defsym QT_NO_CAST_TO_ASCII --defsym QT_NO_DEBUG --defsym QT_NO_FOREACH --defsym QT_NO_USING_NAMESPACE --defsym QT_USE_QSTRINGBUILDER --defsym _LARGEFILE64_SOURCE --defsym _LARGEFILE_SOURCE -Isrc/corelib/Core_autogen/include -Iinclude -Iinclude/QtCore -Isrc/corelib -Isrc/corelib/global -Isrc/corelib/../3rdparty/tinycbor/src -Iinclude/QtCore/6.0.0 -Iinclude/QtCore/6.0.0/QtCore -Isrc/corelib/../3rdparty/double-conversion/.. -Isrc/corelib/../3rdparty/double-conversion/include -Isrc/corelib/../3rdparty/forkfd -Isrc/corelib/.rcc -Imkspecs/linux-g++ -Isrc/3rdparty/pcre2/src -isystem .../host/usr/include -O3 -DNDEBUG -fPIC -Wall -Wextra -fPIC --MD src/corelib/CMakeFiles/Core.dir/global/minimum-linux.S.o.d -o src/corelib/CMakeFiles/Core.dir/global/minimum-linux.S.o -c src/corelib/global/minimum-linux.S + Assembler messages: + Fatal error: bad defsym; format is --defsym name=value + +Signed-off-by: Peter Seiderer +--- + src/corelib/CMakeLists.txt | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt +index c4461da6..64a00343 100644 +--- a/src/corelib/CMakeLists.txt ++++ b/src/corelib/CMakeLists.txt +@@ -566,10 +566,10 @@ qt_internal_extend_target(Core CONDITION INTEGRITY + #) + # special case end + +-qt_internal_extend_target(Core CONDITION LINUX AND NOT static +- SOURCES +- global/minimum-linux_p.h +-) ++#qt_internal_extend_target(Core CONDITION LINUX AND NOT static ++# SOURCES ++# global/minimum-linux_p.h ++#) + + #### Keys ignored in scope 34:.:global:global/global.pri:precompile_header: + # NO_PCH_ASM = "global/minimum-linux.S" +@@ -583,10 +583,10 @@ qt_internal_extend_target(Core CONDITION LINUX AND NOT static + #### Keys ignored in scope 35:.:global:global/global.pri:silent: + # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&" + +-qt_internal_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static +- SOURCES +- global/minimum-linux.S +-) ++#qt_internal_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static ++# SOURCES ++# global/minimum-linux.S ++#) + + qt_internal_extend_target(Core CONDITION QT_FEATURE_slog2 + LIBRARIES +-- +2.30.0 + diff --git a/package/qt6/qt6base/0002-QtAutoDetect-fix-failure-with-multiline-toolchain-fi.patch b/package/qt6/qt6base/0002-QtAutoDetect-fix-failure-with-multiline-toolchain-fi.patch new file mode 100644 index 0000000000..a93ecea6f7 --- /dev/null +++ b/package/qt6/qt6base/0002-QtAutoDetect-fix-failure-with-multiline-toolchain-fi.patch @@ -0,0 +1,48 @@ +From 44a440164c5bbc5168c6034f1bf5d396b20cd076 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 6 Feb 2021 13:12:09 +0100 +Subject: [PATCH] QtAutoDetect: fix failure with multiline toolchain file + +The unquoted 'string(FIND ${toolchain_file_content} ...)' call fails for +multiline content of the variable toolchain_file_content, so add +quates arround, fixes: + + [...] + CMake Error at cmake/QtAutoDetect.cmake:42 (string): + string sub-command FIND requires 3 or 4 parameters. + Call Stack (most recent call first): + cmake/QtAutoDetect.cmake:311 (qt_auto_detect_android) + CMakeLists.txt:19 (include) + [...] + -- Configuring incomplete, errors occurred! + +in case the given toolchain file starts with multiple lines +in the first 80 characters, e.g. in the case of buildroot: + + # + # Automatically generated file; DO NOT EDIT. + # CMake toolchain file for Buildroot + # + [...] + +Signed-off-by: Peter Seiderer +--- + cmake/QtAutoDetect.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake +index 4518078d..36761dba 100644 +--- a/cmake/QtAutoDetect.cmake ++++ b/cmake/QtAutoDetect.cmake +@@ -39,7 +39,7 @@ function(qt_auto_detect_android) + if(DEFINED CMAKE_TOOLCHAIN_FILE AND NOT DEFINED QT_AUTODETECT_ANDROID) + + file(READ ${CMAKE_TOOLCHAIN_FILE} toolchain_file_content OFFSET 0 LIMIT 80) +- string(FIND ${toolchain_file_content} "The Android Open Source Project" find_result REVERSE) ++ string(FIND "${toolchain_file_content}" "The Android Open Source Project" find_result REVERSE) + if (NOT ${find_result} EQUAL -1) + set(android_detected TRUE) + else() +-- +2.30.0 + diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in new file mode 100644 index 0000000000..9429ebd8f7 --- /dev/null +++ b/package/qt6/qt6base/Config.in @@ -0,0 +1,311 @@ +config BR2_PACKAGE_QT6BASE + bool "qt6base" + select BR2_PACKAGE_DOUBLE_CONVERSION + select BR2_PACKAGE_LIBB2 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_PCRE2 + select BR2_PACKAGE_PCRE2_16 + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6base module, which + contains the base Qt libraries: QtCore, QtNetwork, QtGui, + QtWidgets, etc. + + http://qt.io + +if BR2_PACKAGE_QT6BASE + +config BR2_PACKAGE_QT6BASE_CUSTOM_CONF_OPTS + string "Custom configuration options" + help + Define custom qt6 configuration options which can be used to + enable or disable options not managed by buildroot. These + options are appended to the ones generated by buildroot and + passed to qt6base during configuration. + + Use cmake style '-Dsome_option_name=ON' or -Dsome_option_name=OFF'. + + +#config BR2_PACKAGE_QT6BASE_CONFIG_FILE +# string "Config file" +# help +# Configure options allow to set which modules are being +# compiled or not in Qt, but Qt also provide a more +# fine-grained mechanism to configure which features should be +# enabled or disabled, through a header file. Examples of such +# header files can be found in src/corelib/global/qconfig-*.h +# in the Qt sources. +# +# This option allows to set the path of such a configuration +# file, which Buildroot will give to Qt at compile time. +# +config BR2_PACKAGE_QT6BASE_EXAMPLES + bool "Compile and install examples (with code)" +# select BR2_PACKAGE_QT6BASE_NETWORK +# select BR2_PACKAGE_QT6BASE_XML + help + If unsure, say N. + +config BR2_PACKAGE_QT6BASE_NETWORK + bool "network module" + help + This options enables the Qt6Network library. + +config BR2_PACKAGE_QT6BASE_CONCURRENT + bool "concurrent module" + help + This options enables the Qt6Concurrent library. + +config BR2_PACKAGE_QT6BASE_SQL + bool "sql module" + help + This options enables the Qt6Sql library. + +if BR2_PACKAGE_QT6BASE_SQL +config BR2_PACKAGE_QT6BASE_MYSQL + bool "MySQL Plugin" + depends on BR2_USE_MMU # mysql + select BR2_PACKAGE_MYSQL +# select BR2_PACKAGE_NCURSES +# select BR2_PACKAGE_READLINE + help + Build MySQL plugin + If unsure, say n. + +config BR2_PACKAGE_QT6BASE_PSQL + bool "PostgreSQL Plugin" + depends on BR2_USE_MMU # postgresql + depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR # postgresql + select BR2_PACKAGE_POSTGRESQL + help + Build PostgreSQL plugin + If unsure, say n. + +comment "PostgreSQL plugin needs a toolchain w/ wchar, dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + +choice + prompt "SQLite 3 support" + default BR2_PACKAGE_QT6BASE_SQLITE_NONE + help + Select SQLite support. + +config BR2_PACKAGE_QT6BASE_SQLITE_NONE + bool "No sqlite support" + help + Do not compile any kind of SQLite support. + +config BR2_PACKAGE_QT6BASE_SQLITE_QT + bool "Qt SQLite" + help + Use Qt bundled SQLite support. + +config BR2_PACKAGE_QT6BASE_SQLITE_SYSTEM + bool "System SQLite" + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA + help + Use system SQLite. + +endchoice + +endif # BR2_PACKAGE_QT6BASE_SQL + +config BR2_PACKAGE_QT6BASE_TEST + bool "test module" + help + This options enables the Qt5Test library. + +config BR2_PACKAGE_QT6BASE_XML + bool "XML module" + help + This options enables the Qt5Xml library. + +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_DIRECTFB && \ + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS + help + This option enables the Qt6Gui library. + +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Widgets library. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_AVAILABLE + +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_AVAILABLE + help + This option enables OpenGL support. + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +config BR2_PACKAGE_QT6BASE_OPENGL_LIB + bool "opengl module" + select BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables the Qt6OpenGL library. This library + includes OpenGL support classes provided to ease porting + from Qt 4.x. + +endif + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_DIRECTFB + bool "directfb support" + depends on BR2_PACKAGE_DIRECTFB + +comment "directfb backend available if directfb is enabled" + depends on !BR2_PACKAGE_DIRECTFB + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_QT6_GL_AVAILABLE + select BR2_PACKAGE_QT6BASE_OPENGL + +comment "eglfs backend available if OpenGL and EGL are enabled" + depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_QT6_GL_AVAILABLE + +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + +# ToDo: Qt::PrintSupport/FEATURE_cubs only available if FEATURE_gui/FEATURE_widgets enabled??? +#config BR2_PACKAGE_QT6BASE_PRINTSUPPORT +# depends on BR2_PACKAGE_QT6BASE_WIDGETS +# def_bool y + +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig and Freetype support using + the system fontconfig and freetype2 libraries. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + +endif + +config BR2_PACKAGE_QT6BASE_SYSLOG + bool "syslog support" + help + Logs to the standard UNIX logging mechanism. + +config BR2_PACKAGE_QT6BASE_DBUS + bool "DBus module" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + select BR2_PACKAGE_DBUS + help + This option enables the D-Bus module. + +config BR2_PACKAGE_QT6BASE_ICU + bool "Enable ICU support" + depends on !BR2_BINFMT_FLAT # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu + select BR2_PACKAGE_ICU + help + This option enables ICU support in Qt6. This is for example + needed for Qt6Webkit. + +comment "icu support needs a toolchain w/ gcc >= 4.9, host gcc >= 4.9" + depends on !BR2_BINFMT_FLAT + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 + +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + +endif diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash new file mode 100644 index 0000000000..bf919abf99 --- /dev/null +++ b/package/qt6/qt6base/qt6base.hash @@ -0,0 +1,10 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.0/6.0.0/submodules/qtbase-everywhere-src-6.0.0.tar.xz.sha256 +sha256 8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa qtbase-everywhere-src-6.0.1.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk new file mode 100644 index 0000000000..144f91dbec --- /dev/null +++ b/package/qt6/qt6base/qt6base.mk @@ -0,0 +1,496 @@ +################################################################################ +# +# qt6base +# +################################################################################ + +QT6BASE_VERSION = $(QT6_VERSION) +QT6BASE_SITE = $(QT6_SITE) +QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz + +QT6BASE_DEPENDENCIES = \ + host-pkgconf \ + host-ninja \ + host-qt6base \ + double-conversion \ + libb2 \ + pcre2 \ + zlib +QT6BASE_INSTALL_STAGING = YES +QT6BASE_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6BASE_MAKE = ninja +QT6BASE_INSTALL_STAGING_OPTS = install +QT6BASE_INSTALL_STAGING_ENV = DESTDIR=$(STAGING_DIR) +QT6BASE_INSTALL_TARGET_OPTS = install +QT6BASE_INSTALL_TARGET_ENV = DESTDIR=$(TARGET_DIR) +QT6BASE_CONF_OPTS += \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_WITH_PCH=OFF \ + -DFEATURE_animation=OFF \ + -DFEATURE_concurrent=OFF \ + -DFEATURE_doubleconversion=ON \ + -DFEATURE_easingcurve=OFF \ + -DFEATURE_hijricalendar=OFF \ + -DFEATURE_islamiccivilcalendar=OFF \ + -DFEATURE_jalalicalendar=OFF \ + -DFEATURE_libudev=ON \ + -DFEATURE_network=OFF \ + -DFEATURE_mimetype=ON \ + -DFEATURE_mimetype_database=ON \ + -DFEATURE_precompile_header=OFF \ + -DFEATURE_sql=OFF \ + -DFEATURE_system_doubleconversion=ON \ + -DFEATURE_system_libb2=ON \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_system_zlib=ON \ + -DFEATURE_testlib=OFF \ + -DFEATURE_translation=OFF \ + -DINSTALL_DESCRIPTIONSDIR=/usr/lib/qt6/modules \ + -DINSTALL_DOCDIR=/usr/lib/qt6/doc \ + -DINSTALL_EXAMPLESDIR=/usr/lib/qt6/examples \ + -DINSTALL_MKSPECSDIR=/usr/lib/qt6/mkspecs \ + -DINSTALL_PLUGINSDIR=/usr/lib/qt6/plugins \ + -DINSTALL_QMLDIR=/usr/lib/qt6/qml \ + -DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF \ + -DQT_BUILD_TESTS_BY_DEFAULT=OFF \ + -DQT_BUILD_TOOLS_BY_DEFAULT=OFF \ + -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=OFF \ + -DQT_QMAKE_TARGET_MKSPEC=linux-g++ \ + -DQT_USE_BUNDLED_BundledFreetype=OFF \ + -DQT_USE_BUNDLED_BundledLibpng=OFF \ + -DQT_USE_BUNDLED_BundledPcre2=OFF \ + -DECM_ENABLE_SANITIZERS=OFF + + +# -DFEATURE_glib=ON +# -DFEATURE_glibc=OFF + +#ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_90620),y) +#QT6BASE_CFLAGS += -O0 +#QT6BASE_CXXFLAGS += -O0 +#endif +# +QT6BASE_CONF_OPTS += -DFEATURE_sse2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_sse3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_sse4_1=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_sse4_2=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_ssse3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_avx=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_avx2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) +# no buildroot BR2_X86_CPU_HAS_AVX512 option yet +QT6BASE_CONF_OPTS += \ + -DFEATURE_avx512bw=OFF \ + -DFEATURE_avx512cd=OFF \ + -DFEATURE_avx512dq=OFF \ + -DFEATURE_avx512er=OFF \ + -DFEATURE_avx512f=OFF \ + -DFEATURE_avx512ifma=OFF \ + -DFEATURE_avx512pf=OFF \ + -DFEATURE_avx512vbmi=OFF \ + -DFEATURE_avx512vl=OFF + +# ToDo: FEATURE_kms only available if FEATURE_gui enabled??? +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + +# ToDo: FEATURE_kms only available if FEATURE_gui enabled??? +# Uses libgbm from mesa3d +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +QT6BASE_CONF_OPTS += -DFEATURE_gbm=ON +QT6BASE_DEPENDENCIES += mesa3d +else ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y) +QT6BASE_CONF_OPTS += -DFEATURE_gbm=ON +QT6BASE_DEPENDENCIES += gcnano-binaries +else ifeq ($(BR2_PACKAGE_TI_SGX_LIBGBM),y) +QT6BASE_CONF_OPTS += -DFEATURE_gbm=ON +QT6BASE_DEPENDENCIES += ti-sgx-libgbm +else ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) +QT6BASE_CONF_OPTS += -DFEATURE_gbm=ON +QT6BASE_DEPENDENCIES += imx-gpu-viv +else +QT6BASE_CONF_OPTS += -DFEATURE_gbm=OFF +endif + +#ifeq ($(BR2_ENABLE_DEBUG),y) +#QT6BASE_CONFIGURE_OPTS += -debug +#else +#QT6BASE_CONFIGURE_OPTS += -release +#endif +# +#QT6BASE_CONFIGURE_OPTS += -opensource -confirm-license +#QT6BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) +#QT6BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +#ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y) +#QT6BASE_LICENSE += , BSD-3-Clause (examples) +#endif +# +#QT6BASE_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT6BASE_CONFIG_FILE)) +# +#ifneq ($(QT6BASE_CONFIG_FILE),) +#QT6BASE_CONFIGURE_OPTS += -qconfig buildroot +#endif +# +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +QT6BASE_CONF_OPTS += -DFEATURE_libudev=ON +QT6BASE_DEPENDENCIES += udev +else +QT6BASE_CONF_OPTS += -DFEATURE_libudev=OFF +endif + +# ToDo: FEATURE_cubs only available if FEATURE_gui/FEATURE_widgets enabled??? +ifeq ($(BR2_PACKAGE_CUPS), y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif + +# Qt5 SQL Plugins +ifeq ($(BR2_PACKAGE_QT6BASE_SQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql=ON +QT6BASE_CONF_OPTS += -DFEATURE_sql_db2=OFF -DFEATURE_sql_ibase=OFF -DFEATURE_sql_oci=OFF -DFEATURE_sql_odbc=OFF +ifeq ($(BR2_PACKAGE_QT6BASE_MYSQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=ON +QT6BASE_DEPENDENCIES += mysql +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_PSQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_psql=ON +QT6BASE_DEPENDENCIES += postgresql +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_psql=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_SQLITE_SYSTEM),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=ON -DFEATURE_system_sqlite=ON +QT6BASE_DEPENDENCIES += sqlite +else ifeq ($(BR2_PACKAGE_QT6BASE_SQLITE_QT),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=ON -DFEATURE_system_sqlite=OFF +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=OFF +endif + +else # BR2_PACKAGE_QT6BASE_SQL +QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF +endif # BR2_PACKAGE_QT6BASE_SQL + +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON +#QT6BASE_CONF_OPTS += -DFEATURE_opengles2=OFF -DFEATURE_opengles3=OFF -DFEATURE_opengles31=OFF -DFEATURE_opengles32=OFF -DFEATURE_gbm=OFF -DFEATURE_vnc=OFF -DFEATURE_sessionmanager=OFF +QT6BASE_DEPENDENCIES += freetype +QT6BASE_CONF_OPTS += -DFEATURE_vulkan=OFF +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + +# ToDo: FEATURE_kms only available if FEATURE_gui enabled??? +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONFIGURE_OPTS += -DFEATURE_harfbuzz=OFF +endif + +# ToDo: FEATURE_kms only available if FEATURE_gui enabled??? +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif +ifeq ($(BR2_PACKAGE_QT6BASE_DIRECTFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_directfb=ON +QT6BASE_DEPENDENCIES += directfb +else +QT6BASE_CONF_OPTS += -DFEATURE_directfb=OFF +endif +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 \ + libxkbcommon +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_DEPENDENCIES += xlib_libXext +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF +endif + +#QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +#QT6BASE_CONFIGURE_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-qpa $(QT6BASE_DEFAULT_QPA)) + +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONFIGURE_OPTS += -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl +else +QT6BASE_CONFIGURE_OPTS += -DFEATURE_eglfs=OFF +endif + +# ToDo: depend on NETWOK, set FEATURE_openssl_linked, FEATURE_openssl_runtime, +# FEATURE_opensslv11??? +ifeq ($(BR2_PACKAGE_OPENSSL),y) +QT6BASE_CONFIGURE_OPTS += -DFEATURE_openssl=ON +QT6BASE_DEPENDENCIES += ,openssl +else +QT6BASE_CONFIGURE_OPTS += -DFEATURE_openssl=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + +# ToDo: FEATURE_kms only available if FEATURE_gui enabled??? +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +# ToDo: FEATURE_kms only available if FEATURE_gui enabled??? +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + +# ToDo: FEATURE_kms only available if FEATURE_gui enabled??? +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_DBUS),y) +QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON +QT6BASE_DEPENDENCIES += dbus +HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON +#HOST_QT6BASE_DEPENDENCIES += host-dbus +else +QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF +HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +QT6BASE_CONF_OPTS += -DFEATURE_glib=ON +QT6BASE_DEPENDENCIES += libglib2 +else +QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_ICU),y) +QT6BASE_CONF_OPTS += -DFEATURE_icu=ON +QT6BASE_DEPENDENCIES += icu +else +QT6BASE_CONF_OPTS += -DFEATURE_icu=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y) +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON -DQT_BUILD_EXAMPLES_BY_DEFAULT=ON +else +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) +QT6BASE_CONF_OPTS += -DFEATURE_network=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_network=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_CONCURRENT),y) +QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_TEST),y) +QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XML),y) +QT6BASE_CONF_OPTS += -DFEATURE_xml=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_xml=OFF +endif + +# ToDo: FEATURE_kms only available if FEATURE_gui enabled??? +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -D FEATURE_libinput=OFF +endif + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +QT6BASE_CONF_OPTS += -DFEATURE_journald=ON +QT6BASE_DEPENDENCIES += systemd +else +QT6BASE_CONF_OPTS += -DFEATURE_journald=OFF +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +QT6BASE_CONF_OPTS += -DFEATURE_zstd=ON +QT6BASE_DEPENDENCIES += zstd +else +QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_SYSLOG),y) +QT6BASE_CONF_OPTS += -DFEATURE_syslog=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_syslog=OFF +endif +# +#ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) +## use vivante backend +#QT6BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv +#else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +## use mali backend +#QT6BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali +#endif +# +#ifneq ($(QT6BASE_CONFIG_FILE),) +#define QT6BASE_CONFIGURE_CONFIG_FILE +# cp $(QT6BASE_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h +#endef +#endif +# +#QT6BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf +#ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +## Qt 5.8 needs atomics, which on various architectures are in -latomic +#define QT6BASE_CONFIGURE_ARCH_CONFIG +# printf 'LIBS += -latomic\n' >$(QT6BASE_ARCH_CONFIG_FILE) +#endef +#endif +# +## This allows to use ccache when available +#define QT6BASE_CONFIGURE_HOSTCC +# $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf +# $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf +#endef + +# Must be last so can override all options set by Buildroot +QT6BASE_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_QT6BASE_CUSTOM_CONF_OPTS)) + +#define QT6BASE_CONFIGURE_CMDS +# mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/ +# sed 's/@EGLFS_DEVICE@/$(QT6BASE_EGLFS_DEVICE)/g' \ +# $(QT6BASE_PKGDIR)/qmake.conf.in > \ +# $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf +# $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ +# $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h +# $(QT6BASE_CONFIGURE_CONFIG_FILE) +# touch $(QT6BASE_ARCH_CONFIG_FILE) +# $(QT6BASE_CONFIGURE_ARCH_CONFIG) +# $(QT6BASE_CONFIGURE_HOSTCC) +# (cd $(@D); \ +# $(TARGET_MAKE_ENV) \ +# PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ +# MAKEFLAGS="-j$(PARALLEL_JOBS) $(MAKEFLAGS)" \ +# ./configure \ +# -v \ +# -prefix /usr \ +# -hostprefix $(HOST_DIR) \ +# -headerdir /usr/include/qt6 \ +# -sysroot $(STAGING_DIR) \ +# -plugindir /usr/lib/qt/plugins \ +# -examplesdir /usr/lib/qt/examples \ +# -no-rpath \ +# -nomake tests \ +# -device buildroot \ +# -device-option CROSS_COMPILE="$(TARGET_CROSS)" \ +# -device-option BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)" \ +# -device-option BR_COMPILER_CXXFLAGS="$(QT6BASE_CXXFLAGS)" \ +# $(QT6BASE_CONFIGURE_OPTS) \ +# ) +#endef +# +#QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF +# + +HOST_QT6BASE_DEPENDENCIES = host-pkgconf host-ninja host-zlib +HOST_QT6BASE_MAKE = ninja +HOST_QT6BASE_CONF_OPTS += \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=$(HOST_DIR) \ + -DCMAKE_INSTALL_RPATH=$(HOST_DIR)/lib \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_WITH_PCH=OFF \ + -DFEATURE_concurrent=OFF \ + -DFEATURE_glib=OFF \ + -DFEATURE_gui=OFF \ + -DFEATURE_icu=OFF \ + -DFEATURE_network=OFF \ + -DFEATURE_precompile_header=OFF \ + -DFEATURE_sql=OFF \ + -DFEATURE_system_zlib=ON \ + -DFEATURE_testlib=OFF \ + -DQT_BUILD_BENCHMARKS=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF \ + -DQT_BUILD_TOOLS_BY_DEFAULT=OFF + +$(eval $(cmake-package)) +$(eval $(host-cmake-package))