From patchwork Mon Nov 23 21:42:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1405160 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; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=YVetq8Hu; 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 4Cg0xg5Ch7z9s1l for ; Tue, 24 Nov 2020 08:42:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 01784863F1; Mon, 23 Nov 2020 21:42:45 +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 TjRz2YqSJ2KH; Mon, 23 Nov 2020 21:42:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 131E285DA0; Mon, 23 Nov 2020 21:42:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D1A491BF97F for ; Mon, 23 Nov 2020 21:42:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B8BA520513 for ; Mon, 23 Nov 2020 21:42:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SsDPz1sAmjG9 for ; Mon, 23 Nov 2020 21:42:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by silver.osuosl.org (Postfix) with ESMTPS id 7477520493 for ; Mon, 23 Nov 2020 21:42:38 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id s8so20241773wrw.10 for ; Mon, 23 Nov 2020 13:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JVNxNz5d4Jy4Z6uw/oAWE7W+ufE8y28+QrEkautkOIk=; b=YVetq8HuknXHbbPfyKgTClTzUmK3C04aDO2kacVcu8k+wemzZELYwNpVE+JH2AT0Xz BFydBwJV+eEvySAk1NqJdNNKNvINLGog++G+82FYr9sHOglUj9HlyYY02udoAn5ZiGoX J51XRdCjF8ht5evhbOHfm1es5nsO9TfrUks2M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JVNxNz5d4Jy4Z6uw/oAWE7W+ufE8y28+QrEkautkOIk=; b=tDMKlku1VnChivJd1zjpoQ7dlmobXjlbk66i4WBeAnfFo0JLf8rq66nlfZK/tW0BM/ 6YCy6XVgL2bhUBWjvdrb/GbK1yCgOoBhbqzEDnSgHLY14xDj56VF2u0Huud76DWt+5Rg JXvSt5vRpDaOy7sCMj7A+VOLVXhfz5TxAu+C/BJC9uP9TerrtBNboH41oJLp3m0PHpaR orbnuxeDpDSgYSKohrVcckfKIhH5eDpEZ35DG/S0BaTCA++xSHk02MKssXeAStXlvPim bI0PqYXTGkMHeuDmVVa00bb0JQjgVY5rCcOhlC+/praxB/LqD310iFlJE4rz64xXOv/h eZ1Q== X-Gm-Message-State: AOAM5335xDJP5aY7bJyYPChjYEqvU1+hE5KZLDEcJdv6VMXtX2I8azoe zE6g015o8IlDhqJPI5sLmTqmJjIbV2W0qg== X-Google-Smtp-Source: ABdhPJygUrhZXT6U18rgiZ1m+Np4GtNvPtn+wVz30jVmtainQkJTJOkcyp1R3f1PGimh7/Hbv06/tQ== X-Received: by 2002:adf:82cc:: with SMTP id 70mr1769435wrc.74.1606167756766; Mon, 23 Nov 2020 13:42:36 -0800 (PST) Received: from localhost.localdomain (host185251138054.static.fidoka.tech. [185.251.138.54]) by smtp.gmail.com with ESMTPSA id z6sm1169611wmi.1.2020.11.23.13.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 13:42:36 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Mon, 23 Nov 2020 22:42:30 +0100 Message-Id: <20201123214233.1465433-1-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 1/4] package/pkg-qmake: adding FOO_INCLUDE_FIXUP X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Some qmake based packages need to call the syncqt.pl script before building to have a properly populated "include" directory inside the package build tree. This script is automatically executed by qmake when a source tree is from a git clone: buildroot purges the .git directory hence the script never runs. Signed-off-by: Angelo Compagnucci --- Changelog v1 -> v2: * Fixed hash file (suggested by Peter) v2 -> v3: * Moved to use FOO_INCLUDE_FIXUP docs/manual/adding-packages-qmake.txt | 4 ++++ package/pkg-qmake.mk | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/docs/manual/adding-packages-qmake.txt b/docs/manual/adding-packages-qmake.txt index e1621e914e..de508dbea4 100644 --- a/docs/manual/adding-packages-qmake.txt +++ b/docs/manual/adding-packages-qmake.txt @@ -79,3 +79,7 @@ also be defined. * +LIBFOO_INSTALL_TARGET_OPTS+, to specify additional targets to pass to the +make+ command during the target installation step. By default, +install+. + +* +LIBFOO_INCLUDE_FIXUP+, to run syncqt.pl before qmake. Some packages + need this to have a properly populated include directory before + running the build. diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 27727119d7..9d2a036ac3 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -44,6 +44,10 @@ ifneq ($(1),qt5base) $(2)_DEPENDENCIES += qt5base endif +ifdef $(2)_INCLUDE_FIXUP +$(2)_DEPENDENCIES += host-perl +endif + # # Configure step. Only define it if not already defined by the package # .mk file. @@ -52,6 +56,7 @@ ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS $$(QT5_QT_CONF_FIXUP) cd $$($(2)_BUILDDIR) && \ + $$(if $$($(2)_INCLUDE_FIXUP), $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) &&) \ $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) endef endif