From patchwork Tue Jan 16 13:25:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 124665 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp1013097lje; Tue, 16 Jan 2018 05:25:31 -0800 (PST) X-Google-Smtp-Source: ACJfBosOiGyBGcNBZtdoqXHTWfYWdZ5582OYwFbCLWQld/kLUa884KLA+JKSLCHyo/doOuXV+uVk X-Received: by 10.84.128.103 with SMTP id 94mr13398239pla.183.1516109131510; Tue, 16 Jan 2018 05:25:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516109131; cv=none; d=google.com; s=arc-20160816; b=xqTP3lG+zOJNFxMqUogH6Fw8rlCFgkdfw+DyZzEiEv1MSwUUp2U5fgdqWk780PXvca v6XeZsZK4N+hsC+ZD8TU34TyuLs2PkXd1pWSAhrslV75Ss2yxTDDKqZbIim71uYbTToL 1DidCDkDwDzd2kOGGM+a1m1uIkJ9xaop87MRemDtt5d+vWnm4y2R2kYzAz0bwsxR1ttn q9M7aMfBgf4XwPRMEZcsjrr5di/ZJ7Y2ZbwTGe+UVeoeEx7B7/G5/RA4e27ZAUHUaldB qTiwJcvy5eQyP4LVHO18LCQBRjMXQqz6GOG6jEMtO3bAnJTCiQ1QHsQDIE6HPAdI0pLT mzpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=m5hGQC4DCjyN807ZPiLVTop3Nk2xXppl6Bo2gMG3vEY=; b=jF2XGFfsLK0qEm2JVHvf+ouxM/LV0nl/gFrh2GlI7ZgwpE4zke5mIdTWBbwyjCL7Kr MjMQA8O5S6WRTVccIXq7eKInTNJ5WaQ9gCedbjCWbr+dSAY6bCCDEoiNigsdoy/GQLfz 0ufuyROQ9Vh/kQeRwb7cpSsrhcgnLL255k5pSJMRIQokRaMCXOPCFtKlNZFde+mwlSRq 0VzuZZ66Yqp+5YEd84cygjiJfY9avCDkNY+pOjg2+SaiEi9tTLDbBQqP/ZyXLLKfNqrS /RBbOeiRBPTCXgQmNzOj8XoV2icAVzCJDai51PbVBwfWo3RqILrC2M+7Hqn4+YEg05jj lVeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=dmaWld7P; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n188si1716765pgn.289.2018.01.16.05.25.31; Tue, 16 Jan 2018 05:25:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=dmaWld7P; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id F060F6E650; Tue, 16 Jan 2018 13:25:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by mail.openembedded.org (Postfix) with ESMTP id 395356E650 for ; Tue, 16 Jan 2018 13:25:23 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id z48so15153635wrz.6 for ; Tue, 16 Jan 2018 05:25:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=ilraV5y/YHyYZ/kDZn/IGFOidXQ7ZXVGy8J1pZyMaLQ=; b=dmaWld7P1n0eTu8mtLocgQeRdnTwOsK6jNpJf3Egh46RupZpPSZgrzOP96t3zA4KoD z88NdfB8vwVc5GT0Gyx1tKL6IMXbtA2GanhyYFvrixUMpoCo8NDL/6+V0kxL7UrC3/Mt z2m+Wj7IyOBOL2PG/anzlKnsIdNZlZRVD7p7oHg8zcMSjoLH1WqX0CU3mE6KKOQSRO3V B7nvLHsFcQQ61e+V9/FOo0ehq+Z5X1ouCOn+7RCBwMaNzCMeB0pdbHF0hdqeyZTW1Y81 1kF4KNgX1zAJcGK9Ts7x1MBgjUVOpcC8UBsSvRkGPdVpdaSpj2ZoOveuU+C/iwluUTqA 6gVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ilraV5y/YHyYZ/kDZn/IGFOidXQ7ZXVGy8J1pZyMaLQ=; b=D9egqJYLwDPM9ZBY9y5s3G5M9N6XWklG94Gfw/kfV7dK+r5CPk8m6r1EsbjmyppffR +6ZHoXzogyQQnVfzIK6LdpJtG8yNoOMNSz7mrsmaEny6kuVFYpSXLbUhpd7sfKjCIX4I C14aS90f2PZBWZ+XlrOKiRW6YixQQI5Jq4aZR84EHBNHHAJIItoIpA0XOe7NOV3S6F7F 6vI2BfJG+BN3qbBD6TUdOVt5qzM3lE56OcwmebAUQwCEhGXnftHEL193cmsTkm9VuLvH ziiwTfQttumldXOrgoEOlWM0jl1mzgf9XhqccazR0MG/se4r/5h7LC0vm+1WT3X3swDN u/4A== X-Gm-Message-State: AKwxytfmhDM3uP2szBkj4YH+tjwXyfvzFu5wcSYiteLjAEhNjkL1BAgo JbOLUSOFea4AUOIBL3LfeaQMkFw0 X-Received: by 10.223.193.71 with SMTP id w7mr10099739wre.88.1516109124557; Tue, 16 Jan 2018 05:25:24 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id f76sm1731576wme.2.2018.01.16.05.25.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 05:25:23 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 16 Jan 2018 13:25:15 +0000 Message-Id: <20180116132516.27653-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/2] cmake: allow target names to be overridden X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Don't hardcode the targets used in do_compile and do_install, instead build "all" and "install" by default but respect OECMAKE_TARGET_COMPILE and OECMAKE_TARGET_INSTALL variables. Signed-off-by: Ross Burton --- meta/classes/cmake.bbclass | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Acked-by: Otavio Salvador diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index a4079dab0d7..10c4edcf1a5 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -34,6 +34,9 @@ EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}" EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} " EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} " +OECMAKE_TARGET_COMPILE ?= "all" +OECMAKE_TARGET_INSTALL ?= "install" + FILES_${PN}-dev += "${libdir}/cmake ${datadir}/cmake" # CMake expects target architectures in the format of uname(2), @@ -140,13 +143,13 @@ cmake_do_configure() { do_compile[progress] = "percent" cmake_do_compile() { - bbnote VERBOSE=1 cmake --build '${B}' -- ${EXTRA_OECMAKE_BUILD} - VERBOSE=1 cmake --build '${B}' -- ${EXTRA_OECMAKE_BUILD} + bbnote VERBOSE=1 cmake --build '${B}' --target ${OECMAKE_TARGET_COMPILE} -- ${EXTRA_OECMAKE_BUILD} + VERBOSE=1 cmake --build '${B}' --target ${OECMAKE_TARGET_COMPILE} -- ${EXTRA_OECMAKE_BUILD} } cmake_do_install() { - bbnote DESTDIR='${D}' cmake --build '${B}' --target install -- ${EXTRA_OECMAKE_BUILD} - DESTDIR='${D}' cmake --build '${B}' --target install -- ${EXTRA_OECMAKE_BUILD} + bbnote DESTDIR='${D}' cmake --build '${B}' --target ${OECMAKE_TARGET_INSTALL} -- ${EXTRA_OECMAKE_BUILD} + DESTDIR='${D}' cmake --build '${B}' --target ${OECMAKE_TARGET_INSTALL} -- ${EXTRA_OECMAKE_BUILD} } EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file From patchwork Tue Jan 16 13:25:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 124666 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp1013159lje; Tue, 16 Jan 2018 05:25:44 -0800 (PST) X-Google-Smtp-Source: ACJfBoug7c6Ul76+gM6iXYu30YxGxtJxmTfBL2bt3ufRlVZCCyBZ133KIZGqNfSGub/0p5u4+zYL X-Received: by 10.84.234.196 with SMTP id i4mr10801010plt.304.1516109143931; Tue, 16 Jan 2018 05:25:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516109143; cv=none; d=google.com; s=arc-20160816; b=k82u4g2syaWLv2qT/NxXSrLifbLs8h7TtIJfzMVlqfSBsdc/mNXv55yP03CYEDDw63 vKqcKoBGCLRj/D+HiukWZ/GFDSpHcMkTNWjNnGwZxb1DMlA2dfB6u09hU7f84Qgmh09c KYPmoMjc7CeV+lJbhQR+O/q1tEOP6E19RXRzqhrAMANNsgxMkDyP5Sv2f+kqRh4ajvvW 3RooUN4G55UBO8X9QKPr1prH7hRsnb1kAPcLhXnIYfxSF4RGtZrXgxwbpVKuUyAlvfxN Dk/NsxKrE6Y0VQ+C+H7+7mKkiG/8cvGKFlu6Xkp4sVDPQbsx+gEVB88RGPFmX9r03Sal rJqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=LxADUym6DgpHlnlS8GcxFBYvB1mZjklV4ulnn+wXde8=; b=I0AvfBGEhpkGrvwINzNBba7D/orFZxOYz+lJepCzNWeBJw+c1t725rxAs88gAdYsgA fuJZcesCF98+ISFIHMSmpAqtE8axoDmiiegG4Af0bwrNtBk1clxMG4TkNwj3jwAQSwZd BLdVIgHV1/HFU/Jv3TrURckBoZuTXuN38+mfP4E7jRbo0wGv161Du01LSleBgsO/a6M/ bR32zPfkEIdMCphgxyOxW2O8l3qhH07BWRYnqEhJg1THMclYI5uDcvXGeNSZYoALTKZo iHMNDFRMeltb9fAnFpRtJxedrzIzJBugQSgymNKfFBQlztpecSHXmcascfl49tvLisH6 4fBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=SDDzH1Hk; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s1si1650833pgp.577.2018.01.16.05.25.43; Tue, 16 Jan 2018 05:25:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=SDDzH1Hk; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2E25078681; Tue, 16 Jan 2018 13:25:41 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by mail.openembedded.org (Postfix) with ESMTP id 92D097827E for ; Tue, 16 Jan 2018 13:25:24 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id 100so15139527wrb.7 for ; Tue, 16 Jan 2018 05:25:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=7T8YFFRUScafPs+R2woV/GMH7qSV7FAgPjHhDrhOWnY=; b=SDDzH1HkY/dpjuI2cWZPs3GrupTf13iMToLbpDkaBtNUaUUbvUUKFp5X64WEXT63nO 10qaPpGgMTwmqcIOqqvPYSOvCH5pWMhiVEzUuzHbCS5oNAuI8caKb4vtJwZM/E/eBktp tCrog2jpEaLq+JRX5tD2wrBRJiN1VGatuULTYG1S/+BWITQQD0ZwDHpVJXlQzDqh9Jb/ 0ORgE4/IWXjY5I4LBtVqKYeQCCnR2PBz8OtjCQuVdgnxXR2vDtQueq2su8NxzNONEwmt fscx8KwGRP/odaV4KYk9ySLUGVpGiNrwdCKzsTvmVWptbD1ELswIEjSZCjlwU+J9WnRD ciog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=7T8YFFRUScafPs+R2woV/GMH7qSV7FAgPjHhDrhOWnY=; b=LqpfeAbyNTVw4y9vDpvFLhdmLT9ZOLM0IkMzmW0K0evFFXr0Hhw3PhOsG2JskySXft buPHr7LQyT7i0SMoQts1t4gNXKqxvU8msZXpZyv6tZPpaRvtnSLhySzwpWtrcIxyNIF3 binbSVHLDQm/VLxgr5r5o/GyR+VsqqjB5FLs2Pt6pm4KGSkxWftIrIeLw/n6Ew3TjwC1 i5Qunz7OMrWrDWP3cod4tCnUu/Ob9casxLJexwdK/6GnFUn2gbDeSkljhR4W4sW3jxjg 31QfqgvQSDx48WYxuUE2XXqUoNa/ALmC5Int3JJ/9ZkfixzkQniIMBKenoy7elbBIC6Y I1Rg== X-Gm-Message-State: AKwxytfrUm4ko3TKkQpo2iS5/Q2XtyNw9DAXTTgWNIFmATunwcb5nXok MweS8RnT3jbNdon7V+fzlCA0pZjD X-Received: by 10.223.134.179 with SMTP id 48mr4787692wrx.93.1516109125567; Tue, 16 Jan 2018 05:25:25 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id f76sm1731576wme.2.2018.01.16.05.25.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 05:25:24 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 16 Jan 2018 13:25:16 +0000 Message-Id: <20180116132516.27653-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180116132516.27653-1-ross.burton@intel.com> References: <20180116132516.27653-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] piglit: override install target name instead of do_install X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Simply override the install target, instead of reimplementing do_install. Apart from being neater, this also stops the recipe expecting that cmake is using the Make backend. Signed-off-by: Ross Burton --- meta/recipes-graphics/piglit/piglit_git.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Acked-by: Otavio Salvador diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 9471bd08c43..06c5021eb76 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -41,9 +41,7 @@ do_configure_prepend() { fi } -do_install() { - oe_runmake -C ${B} 'DESTDIR=${D}' install/strip -} +OECMAKE_TARGET_INSTALL = "install/strip" RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \ python3-subprocess python3-misc python3-importlib \