From patchwork Wed Dec 16 17:44:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Soucy X-Patchwork-Id: 1417327 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=fail (p=none dis=none) header.from=sense.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sense.com header.i=@sense.com header.a=rsa-sha256 header.s=google header.b=d7ladXyv; 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 4Cx37j2MQWz9sSC for ; Thu, 17 Dec 2020 05:10:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DCA50867D1; Wed, 16 Dec 2020 18:10:07 +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 E6LM7k4WjQtx; Wed, 16 Dec 2020 18:10:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id AEBD8867B6; Wed, 16 Dec 2020 18:10:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9E7BE1BF34F for ; Wed, 16 Dec 2020 18:10:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9869F872F3 for ; Wed, 16 Dec 2020 18:10:05 +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 7Xb78JjUs3WT for ; Wed, 16 Dec 2020 18:10:04 +0000 (UTC) X-Greylist: delayed 00:25:55 by SQLgrey-1.7.6 Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5292687263 for ; Wed, 16 Dec 2020 18:10:04 +0000 (UTC) Received: by mail-qv1-f49.google.com with SMTP id l14so11853086qvh.2 for ; Wed, 16 Dec 2020 10:10:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sense.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WZel+4G9h2n82h21n5WKPMiR6+PXIiV7lCrbw5jOt2k=; b=d7ladXyvBqXFI+cZIxW/jNgu8KR56r4RMi6+RLHYII3M1+SW8F4/RHYpCFgkrV7LTP 6bz7GaivlzmgEbDi2wxBvP/Ef/0ypbgR5DCXN+FJwtIO1h1g1LCdk9+U2s5Um5CyeePZ oXaUa7IUIff+h4fEEF+95SgkVhk0JelNcfqa8= 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=WZel+4G9h2n82h21n5WKPMiR6+PXIiV7lCrbw5jOt2k=; b=UX5ve7AkrQ1FeoBEiueAKlF7Cyobx7sMGraRRv7TcFM2eWZFoT6x1wBIRpoxeLX+Q0 OmsuA4XveRlsUGMbFV/hLfsLilKTbaGrMYmxzcv+XtXVWNMGzhDkjtSUHevkqtL6AlOx swM0daxmLrfX9+ZpJ91uTww4Z3xjvoFfyLxRTwiwyjustO+Kbt8swUgkvDMuzOcxAGW1 y4zinD/XH2Wpjhn+apT0u4HE2tNRpIp7J9gUyCanmkemZEC+TtKuVcNBC/POk8VXPUZ8 rrqg/yAF2IPxW3D3wvaw0OKU5Eu7SpOXWnTaC2XggS2IV00VyuXc/cRaihYzxN8H8nrG 9AhQ== X-Gm-Message-State: AOAM53272NKZZ1mxZLr4bt+e5km/4HjJ83eziGKx+1L5elpzGhHeXOtY qvY+EYjB/igSzheXrcdrYuEoZE3bFmrceQTe X-Google-Smtp-Source: ABdhPJykG75ZMFKUC3mrhtsaCKyH/HkyiTLszbcB8gtDaAAu/dTNKSHrWag78AeV0mrnByj8Ymvpww== X-Received: by 2002:a05:6214:487:: with SMTP id ay7mr44898346qvb.37.1608140648303; Wed, 16 Dec 2020 09:44:08 -0800 (PST) Received: from PaulSouyMacbook.home.sproutlyled.com (pool-108-20-130-45.bstnma.fios.verizon.net. [108.20.130.45]) by smtp.gmail.com with ESMTPSA id j124sm1543292qkf.113.2020.12.16.09.44.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Dec 2020 09:44:07 -0800 (PST) From: Paul Soucy To: buildroot@buildroot.org Date: Wed, 16 Dec 2020 12:44:04 -0500 Message-Id: <20201216174404.47363-1-paul.soucy@sense.com> X-Mailer: git-send-email 2.24.1 (Apple Git-126) MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake 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: , Cc: Paul Soucy , Michael Nosthoff , Stephan Hoffmann Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" host-gtest does not actually build and install gtest libraries or header files, it just installs the gmock_gen stuff. This patch will now build and install gtest to the host like a normal cmake package. Signed-off-by: Paul Soucy --- package/gtest/gtest.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 7f967b8bfb..f35ae63383 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -88,14 +88,15 @@ else GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF endif -define HOST_GTEST_INSTALL_CMDS +define HOST_GTEST_POST_INSTALL_PYTHON $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \ $(HOST_DIR)/bin/gmock_gen cp -rp $(@D)/googlemock/scripts/generator/cpp \ $(HOST_GTEST_GMOCK_PYTHONPATH) endef +HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON + + $(eval $(cmake-package)) -# The host package does not build anything, just installs gmock_gen stuff, so -# it does not need to be a host-cmake-package. -$(eval $(host-generic-package)) +$(eval $(host-cmake-package))