From patchwork Mon Feb 17 21:23:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239594 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de 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 48LxtP104Wz9sRG for ; Tue, 18 Feb 2020 08:28:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 187F386CAC; Mon, 17 Feb 2020 21:28:25 +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 Ppo0siAeyYoU; Mon, 17 Feb 2020 21:28:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3230486887; Mon, 17 Feb 2020 21:28:23 +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 BFE131BF37B for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BC88E2048D for ; Mon, 17 Feb 2020 21:28:13 +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 LXW2motxt7Xj for ; Mon, 17 Feb 2020 21:28:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by silver.osuosl.org (Postfix) with ESMTPS id BC01620002 for ; Mon, 17 Feb 2020 21:28:10 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id F1F1DB90278E; Mon, 17 Feb 2020 22:28:08 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:27 +0100 Message-Id: <20200217212350.29750-6-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 05/28] package/qwt: Partially convert to qmake infra 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: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use the qmake infra CONFIGURE and BUILD generic but keep the manipulation of qwtconfig.pri as PRE_CONFIGURE_HOOK as well as the custom install steps. Signed-off-by: Andreas Naumann --- package/qwt/qwt.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index e0ffec765f..1fec17b19a 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -41,14 +41,11 @@ else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDll.*$$/QWT_CONFIG += QwtDll/' endif -define QWT_CONFIGURE_CMDS +define QWT_PRE_CONFIGURE_CMD $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) endef -define QWT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef +QWT_PRE_CONFIGURE_HOOKS += QWT_PRE_CONFIGURE_CMD # After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so # that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and @@ -64,4 +61,4 @@ define QWT_INSTALL_TARGET_CMDS rm -Rf $(TARGET_DIR)/usr/mkspecs endef -$(eval $(generic-package)) +$(eval $(qmake-package))