From patchwork Wed Sep 4 21:10:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1980998 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WzZsj1s9cz1yg7 for ; Thu, 5 Sep 2024 07:11:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 42CB18122D; Wed, 4 Sep 2024 21:11:03 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id n_lc4XHteGx5; Wed, 4 Sep 2024 21:11:02 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1BA2D80D3A Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 1BA2D80D3A; Wed, 4 Sep 2024 21:11:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BEF0D1BF423 for ; Wed, 4 Sep 2024 21:11:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id AAF4580DC9 for ; Wed, 4 Sep 2024 21:11:00 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 9tG_ytmjiMon for ; Wed, 4 Sep 2024 21:10:59 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::230; helo=mail-lj1-x230.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 76C9680D24 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 76C9680D24 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by smtp1.osuosl.org (Postfix) with ESMTPS id 76C9680D24 for ; Wed, 4 Sep 2024 21:10:59 +0000 (UTC) Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2f3fea6a0a9so721151fa.0 for ; Wed, 04 Sep 2024 14:10:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725484257; x=1726089057; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=h0tcyXgRnMSGa2uMuFR+4R7COT5DXpu+065yIw3zEgU=; b=sNay+g6VCFxoekw3ApIwjkdqBHRTUoTH2vl1JwehW5jGxu99u0IjxdRC/MuY+4XyEQ 5CVFKN190tuj+nAA47R96wvcKsUKftLE4wOlZl+cbp/k8j8XWnnHLJFFF8PsD/Q9uWTy qqwEcLfh4EES1xxGpwAppP0gG98akKnP2ECqcXsbFzLRVEgz7vU0DJR6GICuWC1csTQ+ 3W7C6pztv/LDHGfLR0IuYiTMZxVtZbKjIpvbm5rPm9PnfogAstL3PpcP0P2nJjy6mizv aaeY3MSZfIDTVG3g8gLUeUHLzmVBtMkB8k/JCDTZWn0bgsCT624fqKmrypG38D8tD/lP PqRg== X-Gm-Message-State: AOJu0Yz7chSz//OS56CDWgYjAjEofcE5olpvNrejUnF6lpWbLKkM0BS3 p5f24DP8aoezSoLRvxbBfSDyKFdXa0FEumIZ5f55j49fk8ERyIfdpEPvfA== X-Google-Smtp-Source: AGHT+IHql0/Z8FU7PUA6FoFK+V+eEWQQLhmj8qEvK/d8yVsElJgTx/+ogxtzbpdTcbSeuk7kC/iH/w== X-Received: by 2002:a05:651c:1504:b0:2ef:334e:7c36 with SMTP id 38308e7fff4ca-2f657bd5a68mr11029371fa.6.1725484256102; Wed, 04 Sep 2024 14:10:56 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f614ed1565sm26308861fa.6.2024.09.04.14.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 14:10:55 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Wed, 4 Sep 2024 23:10:44 +0200 Message-ID: <20240904211049.866640-1-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725484257; x=1726089057; darn=buildroot.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=h0tcyXgRnMSGa2uMuFR+4R7COT5DXpu+065yIw3zEgU=; b=L+eqMbwbdXSO/vERQbiwt1W/+G7Szxwo2LeW5FLiAZghCCt9pha9nTVDqFthFYugEJ NqkaBv82DoyEdYt0umBd8WSh0/IjWYJ54MZEEzYlHv5H8mVYafyJKVdCz2hUtlrtMszD DJPxhLYQ6tIVQhNGdm8u8DIBqItElDw0Oj7/lrnj9S359t+4YYe3ppMIdbFP2dGHSPRy rd2+88HkTwhQHAEW7D5+tuNNddU/58Y+eXwNzHB62D7NqjFGHPZcj+0Vj3lscB5qjSYZ y5kE3dBtvUlzSyNUxYcdgLFkMe7rvEPTB8I1RkuWtvVBi8v5Le5UGRqB4N2NwoN2mVsz 0mnQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=L+eqMbwb Subject: [Buildroot] [PATCH v2 1/3] package/qt6/qt6base: allow selecting the host print support module X-BeenThere: buildroot@buildroot.org 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: Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" According to configure.cmake print support requires us to select the widgets feature: ... qt_feature("printsupport" PRIVATE LABEL "Qt PrintSupport" CONDITION QT_FEATURE_widgets SECTION "Module" PURPOSE "Provides the Qt PrintSupport module." ) ... And further, according to configure.cmake, widgets requires us to select the gui feature: ... qt_feature("widgets" PRIVATE LABEL "Qt Widgets" AUTODETECT NOT TVOS AND NOT WATCHOS CONDITION QT_FEATURE_gui ) ... Signed-off-by: Roy Kollen Svendsen --- In response to: https://patchwork.ozlabs.org/project/buildroot/patch/20240904122040.738362-2-roykollensvendsen@gmail.com/ Changes v1 -> v2: - make this commit the first one in the series (suggested by Thomas) - remove useless comments (suggested by Thomas) package/qt6/qt6base/Config.in.host | 9 +++++++++ package/qt6/qt6base/qt6base.mk | 14 ++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 46fb668817..786c8ea3a7 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -8,6 +8,11 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI config BR2_PACKAGE_HOST_QT6BASE_NETWORK bool +# The Qt Widgets module is required for printsupport +config BR2_PACKAGE_HOST_QT6BASE_PRINTSUPPORT + bool + select BR2_PACKAGE_HOST_QT6BASE_WIDGETS + # Select this if you need host qt6 tools that require the Qt::Test module # (e.g. qmltestrunner). config BR2_PACKAGE_HOST_QT6BASE_TEST @@ -17,3 +22,7 @@ config BR2_PACKAGE_HOST_QT6BASE_TEST # (e.g. qhelpgenerator). config BR2_PACKAGE_HOST_QT6BASE_SQL bool + +config BR2_PACKAGE_HOST_QT6BASE_WIDGETS + bool + select BR2_PACKAGE_HOST_QT6BASE_GUI diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 4c0392f92d..0617d05f5c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -113,10 +113,8 @@ HOST_QT6BASE_CONF_OPTS += \ -DFEATURE_png=OFF \ -DFEATURE_gif=OFF \ -DFEATURE_jpeg=OFF \ - -DFEATURE_printsupport=OFF \ -DFEATURE_kms=OFF \ -DFEATURE_fontconfig=OFF \ - -DFEATURE_widgets=OFF \ -DFEATURE_libinput=OFF \ -DFEATURE_tslib=OFF \ -DFEATURE_eglfs=OFF @@ -131,6 +129,12 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_PRINTSUPPORT),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + # We need host qt6base with Sql support for host-qt6tools to generate the # qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator is not # available. @@ -150,6 +154,12 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF endif +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_WIDGETS),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option. From patchwork Wed Sep 4 21:10:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1980999 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WzZsq221qz1yg7 for ; Thu, 5 Sep 2024 07:11:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0B50B80D24; Wed, 4 Sep 2024 21:11:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id i8unTBG3D_mk; Wed, 4 Sep 2024 21:11:06 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7BB5581249 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 7BB5581249; Wed, 4 Sep 2024 21:11:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7C4481BF423 for ; Wed, 4 Sep 2024 21:11:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6741280D24 for ; Wed, 4 Sep 2024 21:11:01 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id kay5HKbkJtMa for ; Wed, 4 Sep 2024 21:11:00 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22f; helo=mail-lj1-x22f.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 4A94D80D3A DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4A94D80D3A Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4A94D80D3A for ; Wed, 4 Sep 2024 21:11:00 +0000 (UTC) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2f3f0a31ab2so706131fa.0 for ; Wed, 04 Sep 2024 14:11:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725484258; x=1726089058; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B/Xewvthii261E89vnjOmicis9wMPd5Cg+MK8VXsCRY=; b=Am15SSezvSJafEnbPNcFsPo8QZz+NDxo7SR12zY9AuzrNrvOdrKrFTnIoOUn5nX/X7 +qBfNxPS73EcSSztdnolxAnL1gjLWrtCHFW+8h5/kcQGasjCv0CS+ZSkOjkPmQStSg5a rG/+B5tARontHfCbDUg6NEBe5vosohJbTFF3hFowqtj4Uqh5/fX+sKALg4govoqLmImd /fAaPbRHnfu6mK89iuzdsSko8oWfKOY6xkLOUpjxqBm42aBk3sPWRL0kM070VXtI/Moh 2SOpxT8rUPX+NEu7y3OPzxPebas9WK8c/DakSbCNlQfxsKrVe2CkUxPI2AoGGrK3dF3w 2LMA== X-Gm-Message-State: AOJu0Yw7a+0neNQ6ETAx7u+rA7rC7n8vUhL1OTF9GhdNswzH3Oapiavy DWnCxEn2ZKNwYxUmze4xMq//3+OAkQqfzpHUVXSMruo+c2xQ+2M3qo/VaQ== X-Google-Smtp-Source: AGHT+IH0SxS4ZqRc8KnDfIQd6TFEWEZV5tg76HZGMS4qff7+gna9Upo+cDxYKg+fvXulWCl8DzD3ZA== X-Received: by 2002:a2e:be8d:0:b0:2f4:84f3:120d with SMTP id 38308e7fff4ca-2f61038c67emr167905341fa.8.1725484257742; Wed, 04 Sep 2024 14:10:57 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f614ed1565sm26308861fa.6.2024.09.04.14.10.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 14:10:57 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Wed, 4 Sep 2024 23:10:45 +0200 Message-ID: <20240904211049.866640-2-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240904211049.866640-1-roykollensvendsen@gmail.com> References: <20240904211049.866640-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725484258; x=1726089058; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B/Xewvthii261E89vnjOmicis9wMPd5Cg+MK8VXsCRY=; b=BfSI0CYBSjbxKGGW69IlGQ05o/kaNWKstbFqtI5dpJ9lMbRVmVh9R4vx1qAMIabntU FsLHdUgnh5Rdt0K/+rejsv3PXZYuCJWMYq5LelDgCg7qtwHniysU8Lm1L0BJOUD2D806 6CLJMS10yUYAOvOwq43ZqiUPA27qsjJbQ6E+t6mgxaK33+HQ6hkm2B5ReMCJv7oCWf2s Vrvs8TI7CO0+1dr2kVkh9i7sw6RSxokW19GvKw1JM1YruyHpTWZPQ3wtAC2+KPifvKd4 E0wuO5j1FdLe6xAy74UgScNEXpfF+Ozuqy77hIymr0VNJ6nLfYfFIMVfJJx+DNrAwY2p bKlA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=BfSI0CYB Subject: [Buildroot] [PATCH v2 2/3] package/qt6/qt6tools: separate host and target options X-BeenThere: buildroot@buildroot.org 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: Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Add Config.in.host to allow separating options affecting host and target builds. Move/copy parts of Config.in into Config.in.host. Signed-off-by: Roy Kollen Svendsen --- In response to: https://patchwork.ozlabs.org/project/buildroot/patch/20240904122040.738362-1-roykollensvendsen@gmail.com/ Changes v1 -> v2: - this patch was added to the series as a preliminary step to move the host linguist tools option (see patch 3/3) into Config.in.host package/qt6/Config.in.host | 1 + package/qt6/qt6tools/Config.in | 8 ++------ package/qt6/qt6tools/Config.in.host | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 package/qt6/qt6tools/Config.in.host diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host index dfe7865c57..fa5c39cce1 100644 --- a/package/qt6/Config.in.host +++ b/package/qt6/Config.in.host @@ -1,5 +1,6 @@ if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in.host" +source "package/qt6/qt6tools/Config.in.host" endif diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in index 5f52c5644f..1828e5f043 100644 --- a/package/qt6/qt6tools/Config.in +++ b/package/qt6/qt6tools/Config.in @@ -1,12 +1,8 @@ config BR2_PACKAGE_QT6TOOLS bool "qt6tools" + # The Qt Network module is required select BR2_PACKAGE_QT6BASE_NETWORK - # qt6tools needs host-qt6tools, and host-qt6tools needs - # network support in qt6base. In addition, we also need - # host-qt6base with Sql support to build the qhelpgenerator - # tool, if target support for Sql is present - select BR2_PACKAGE_HOST_QT6BASE_NETWORK - select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL + select BR2_PACKAGE_HOST_QT6TOOLS help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt6/qt6tools/Config.in.host b/package/qt6/qt6tools/Config.in.host new file mode 100644 index 0000000000..4fd28172b9 --- /dev/null +++ b/package/qt6/qt6tools/Config.in.host @@ -0,0 +1,15 @@ +config BR2_PACKAGE_HOST_QT6TOOLS + bool "host qt6tools" + # The Qt Qt Network module is required + select BR2_PACKAGE_HOST_QT6BASE_NETWORK + # Requires the Qt Sql module to build the qhelpgenerator + # tool, if target support for Sql is present + select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Tools provides tools facilitate the development + and design of applications. + + https://github.com/qt/qttools From patchwork Wed Sep 4 21:10:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1981000 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WzZss424yz1yg7 for ; Thu, 5 Sep 2024 07:11:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B4EA580DC9; Wed, 4 Sep 2024 21:11:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id uj7O0--zlIYS; Wed, 4 Sep 2024 21:11:09 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EEA48812E6 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id EEA48812E6; Wed, 4 Sep 2024 21:11:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E88C71BF423 for ; Wed, 4 Sep 2024 21:11:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D604B608A4 for ; Wed, 4 Sep 2024 21:11:03 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id TDiZg2yy8bod for ; Wed, 4 Sep 2024 21:11:03 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22b; helo=mail-lj1-x22b.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 955A660896 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 955A660896 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by smtp3.osuosl.org (Postfix) with ESMTPS id 955A660896 for ; Wed, 4 Sep 2024 21:11:02 +0000 (UTC) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2f4f2868783so523291fa.2 for ; Wed, 04 Sep 2024 14:11:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725484260; x=1726089060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VDH27ulVswsl6xZ+2BJerKqAYDIyLvbzr+fvTNLRRKI=; b=JpmZQFLWfO/7StelGzoX5VSPpN2Ixli1vm9CwJOseTvBmvL0XnS2w/DYYFjGh0mv/f mVAncoM+o8SW6mz1IvKk/a7OHrpPnRLyZScR1CBV4qXTo+vaxEpmYrl+AYvGfw7k0mBk T535ZBM1dmMteoxx+GHDwvw5aPRlhhXhgaanlnb98qulWR+JC9A4JMrH3rCLMyusMAJK qOPdv9hwiMSXm5bnxSY7YgVx4LPqtmGONwJ+Zp14NTE7EJHzP5qZ/qTwknFUPLqSukSD jJSErXPjuYbMPZlQA+KFvlVn6do+9Q0U2iVMSOEQSk6db1tx3eOODHkpIo9Kw2YijniE CLeQ== X-Gm-Message-State: AOJu0YyzAZ/0Vjj3pEypIFbXxvgUuSQIgcQCBcS349EEVQgck5izYXHv QNhrfegreRr0nxYBIbIxGKWbf5bS6vQ8fG0M5ThraBEseDvPXYE9g1HUqA== X-Google-Smtp-Source: AGHT+IHZWVRRlp4OfHhQUTx7TTm/axWf7xoNXatbbpYoVBHKGv2qgLijChc0QBTiqkjnyrOHA7GnXg== X-Received: by 2002:a05:651c:211f:b0:2ef:2df7:3d9a with SMTP id 38308e7fff4ca-2f61e02582emr131083751fa.9.1725484259462; Wed, 04 Sep 2024 14:10:59 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f614ed1565sm26308861fa.6.2024.09.04.14.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 14:10:58 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Wed, 4 Sep 2024 23:10:46 +0200 Message-ID: <20240904211049.866640-3-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240904211049.866640-1-roykollensvendsen@gmail.com> References: <20240904211049.866640-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725484260; x=1726089060; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VDH27ulVswsl6xZ+2BJerKqAYDIyLvbzr+fvTNLRRKI=; b=hJu5ay+joIRrS3O3zjDdLHbPOqSIvZOndUGsjYUAdAFIF7i+RYwLyy54a2kVVGXkqL PxGivnGbug57YCyj65yQW0UF0CuYtg78p7KIP49Xak1K0imbzeUEDZ2YW4pannWBIM7Z G2fgWKPszS1WujQkDa44IOluny+owsXburgULorXIURewoxL0KsM4E977AX8RPJnTCQH 6BAsqZlzZwu4Apf+nEY18Km3TY4IeNJdyhyYWIb0HQjURNZ/eXVyKnewvQ3fyYyRgPIR FH+C9URmGl/4AvAyOyN3mgZ+NMOJXmTTAAg2qL52xogIgZeOGmqkt3h4ST9zpRc27FHk BOxw== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=hJu5ay+j Subject: [Buildroot] [PATCH v2 3/3] package/qt6/qt6tools: add option to build host linguist tools X-BeenThere: buildroot@buildroot.org 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: Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" According to src/linguist/CMakeLists.txt we need to enable the linguist feature: ... if(NOT QT_FEATURE_linguist) return() endif() add_subdirectory(lconvert) add_subdirectory(lprodump) add_subdirectory(lrelease) add_subdirectory(lrelease-pro) add_subdirectory(lupdate) add_subdirectory(lupdate-pro) if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png) add_subdirectory(linguist) endif() ... And according to configure.cmake we need to select print support: ... qt_feature("linguist" PRIVATE LABEL "Qt Linguist" PURPOSE "Qt Linguist can be used by translator to translate text in Qt applications." CONDITION TARGET Qt::PrintSupport ) ... Signed-off-by: Roy Kollen Svendsen --- In response to: https://patchwork.ozlabs.org/project/buildroot/patch/20240904122040.738362-1-roykollensvendsen@gmail.com/ Changes v1 -> v2: - avoid inter-twining target package and host package details in the mk-file (suggested by Thomas) - move host linguist tools option into Config.in.host (suggested by Thomas) package/qt6/qt6tools/Config.in.host | 11 +++++++++++ package/qt6/qt6tools/qt6tools.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/package/qt6/qt6tools/Config.in.host b/package/qt6/qt6tools/Config.in.host index 4fd28172b9..110ecbee9b 100644 --- a/package/qt6/qt6tools/Config.in.host +++ b/package/qt6/qt6tools/Config.in.host @@ -13,3 +13,14 @@ config BR2_PACKAGE_HOST_QT6TOOLS and design of applications. https://github.com/qt/qttools + +if BR2_PACKAGE_HOST_QT6TOOLS + +config BR2_PACKAGE_HOST_QT6TOOLS_LINGUIST_TOOLS + bool "host linguist tools" + select BR2_PACKAGE_HOST_QT6BASE_PRINTSUPPORT + help + Translate Qt C++ and Qt Quick applications into local + languages. + +endif diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk index 09c986cfc6..e91db79a12 100644 --- a/package/qt6/qt6tools/qt6tools.mk +++ b/package/qt6/qt6tools/qt6tools.mk @@ -43,5 +43,11 @@ endif HOST_QT6TOOLS_DEPENDENCIES = host-qt6base +ifeq ($(BR2_PACKAGE_HOST_QT6TOOLS_LINGUIST_TOOLS),y) +HOST_QT6TOOLS_CONF_OPTS += -DFEATURE_linguist=ON +else +HOST_QT6TOOLS_CONF_OPTS += -DFEATURE_linguist=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package))