From patchwork Mon Oct 28 16:36:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1185562 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YL2oEwYR"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4720jZ5Z3Rz9sPL for ; Tue, 29 Oct 2019 03:36:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4ED0D844D9; Mon, 28 Oct 2019 16:36:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iVvXIAmK9j00; Mon, 28 Oct 2019 16:36:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9E1A7844DC; Mon, 28 Oct 2019 16:36:48 +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 CC26C1BF330 for ; Mon, 28 Oct 2019 16:36:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C68E220484 for ; Mon, 28 Oct 2019 16:36:47 +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 oiosRu0Wf5fy for ; Mon, 28 Oct 2019 16:36:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by silver.osuosl.org (Postfix) with ESMTPS id 9AAA0204B5 for ; Mon, 28 Oct 2019 16:36:46 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id u22so15409105qtq.13 for ; Mon, 28 Oct 2019 09:36:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=z5cVkqS2VBuTm0aKsnoeQ7r/NkBSutSYcPf29d3YNZw=; b=YL2oEwYRQM/Hc5h4dmPo/rMwxUibi3gmo5n+wOkXvfNdCdSBsHmJYF8RAEvHmEHq/C cRLN87cPj2q6nPR52x8b7Au5DOm0wcnWqq37E5JsF8o4nqPXd/85o3DV25D305YcESK6 L9L83G5ZPhrCNeyWB868VbZny7nHxgMLxAsUHDlQOj0HgNOP3b4SUxhbhaJRgotiPrdh aJZEIAoR22LP81TNSjs7JGHSZvhWvUO++FpjyvcI7Nf8rFhpb7vsrTj1JaN4vzsXzgXA ZUOD4aT0v/cofzRz+mg2FLAcIbWiRpfnFoLSacO09aHO4vD9QV8fiRWJets127wnUuTN BR2g== 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; bh=z5cVkqS2VBuTm0aKsnoeQ7r/NkBSutSYcPf29d3YNZw=; b=HEDzQ6rhO8HVQGINpPDrAjZAbOsykPzevYuTH6u2rAD99+bcFW0nrjO8Fsao68Kv+a yuek4I47jtfuU7/hY2oKutq+PFYW8JqqeCBQF/4GP1gTpXvpHvCoNnL9F1oGpWAVHkXS L1pBnHOMqWsQespgH+UM0pfn8eBiquOlEy5eFAQYciPp9jp1KDpGZgu3J21OXG0PIQ/z K+EqOE7++88rDLHa1wdISWq+Q9WGV0uGLpjlJ8bo43A1H/QGBdvMxyLNeRmuaXgPRpxO OXycH2Qa2sfiyUfQogi2nu41EBugtfiHov/jLzNB8xhVysDOnYfqZ6WRvd/6WgR2r1zd UMdA== X-Gm-Message-State: APjAAAV4RH3H4+fL8GLqf+fuCW9IUeo76SW3kQG+R2VpGw28E6jr/KKu XFkmhHj1UhygH0sU611PrqZ7kHkE X-Google-Smtp-Source: APXvYqyRkwFeTF1XmIJZgHPxtYkOzUjJpHFxIn9I+q3l/WBPAMS205WRBO+Z9R7mkAXQomYaQWvjAw== X-Received: by 2002:ac8:f88:: with SMTP id b8mr18178316qtk.382.1572280605204; Mon, 28 Oct 2019 09:36:45 -0700 (PDT) Received: from casantos.remote.csb ([191.32.127.90]) by smtp.gmail.com with ESMTPSA id e44sm192554qtc.53.2019.10.28.09.36.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 09:36:44 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Mon, 28 Oct 2019 13:36:33 -0300 Message-Id: <20191028163633.6688-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 Subject: [Buildroot] [PATCH] package/gtest: bump to version 1.10.0 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: Carlos Santos , Stephan Hoffmann MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Drop custom gtest.pc and gmock.pc, already provided. Add a post-install-staging hook to install the gmock-config script. Signed-off-by: Carlos Santos --- package/gtest/gmock.pc | 11 ---------- package/gtest/gtest.hash | 2 +- package/gtest/gtest.mk | 44 +++++++++++++++++++++++----------------- package/gtest/gtest.pc | 11 ---------- 4 files changed, 26 insertions(+), 42 deletions(-) delete mode 100644 package/gtest/gmock.pc delete mode 100644 package/gtest/gtest.pc diff --git a/package/gtest/gmock.pc b/package/gtest/gmock.pc deleted file mode 100644 index 4c723542af..0000000000 --- a/package/gtest/gmock.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib/ -includedir=${prefix}/include - -Name: gmock -Description: Google C++ Mocking Framework -Version: 1.8.0 -Libs: -L${libdir} -lgmock -Libs.private: -lpthread -Cflags: -I${includedir} diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index aa42570eb2..082c597780 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 gtest-1.8.0.tar.gz +sha256 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb gtest-1.10.0.tar.gz sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 googletest/LICENSE diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index f26098bad7..7f967b8bfb 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -GTEST_VERSION = 1.8.0 +GTEST_VERSION = 1.10.0 GTEST_SITE = $(call github,google,googletest,release-$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO @@ -46,17 +46,9 @@ endif GTEST_CONF_OPTS += -DBUILD_GTEST=ON -ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) -GTEST_CONF_OPTS += -DBUILD_GMOCK=ON -else -GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF -endif - -define GTEST_INSTALL_MISSING_FILES - $(INSTALL) -D -m 0644 package/gtest/gtest.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/gtest.pc - # Generate the gtest-config script manually, since the CMake - # build system is not doing it. +# Generate the gtest-config script manually, since the CMake build system is +# not doing it. +define GTEST_INSTALL_GTEST_CONFIG sed 's%@PACKAGE_TARNAME@%gtest%;\ s%@PACKAGE_VERSION@%$(GTEST_VERSION)%;\ s%@prefix@%$(STAGING_DIR)/usr%;\ @@ -70,16 +62,30 @@ define GTEST_INSTALL_MISSING_FILES > $(STAGING_DIR)/usr/bin/gtest-config chmod +x $(STAGING_DIR)/usr/bin/gtest-config endef - -GTEST_POST_INSTALL_STAGING_HOOKS = GTEST_INSTALL_MISSING_FILES +GTEST_POST_INSTALL_STAGING_HOOKS = GTEST_INSTALL_GTEST_CONFIG ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) -define GTEST_GMOCK_INSTALL_MISSING_FILE - $(INSTALL) -D -m 0644 package/gtest/gmock.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/gmock.pc -endef +GTEST_CONF_OPTS += -DBUILD_GMOCK=ON -GTEST_POST_INSTALL_STAGING_HOOKS += GTEST_GMOCK_INSTALL_MISSING_FILE +# Generate the gmock-config script manually, since the CMake build system is +# not doing it. +define GTEST_INSTALL_GMOCK_CONFIG + sed 's%@PACKAGE_TARNAME@%gmock%;\ + s%@PACKAGE_VERSION@%$(GTEST_VERSION)%;\ + s%@prefix@%$(STAGING_DIR)/usr%;\ + s%@exec_prefix@%$(STAGING_DIR)/usr%;\ + s%@libdir@%$(STAGING_DIR)/usr/lib%;\ + s%@includedir@%$(STAGING_DIR)/usr/include%;\ + s%@bindir@%$(STAGING_DIR)/usr/bin%;\ + s%@PTHREAD_CFLAGS@%%;\ + s%@PTHREAD_LIBS@%-lpthread%;' \ + $(@D)/googlemock/scripts/gmock-config.in \ + > $(STAGING_DIR)/usr/bin/gmock-config + chmod +x $(STAGING_DIR)/usr/bin/gmock-config +endef +GTEST_POST_INSTALL_STAGING_HOOKS += GTEST_INSTALL_GMOCK_CONFIG +else +GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF endif define HOST_GTEST_INSTALL_CMDS diff --git a/package/gtest/gtest.pc b/package/gtest/gtest.pc deleted file mode 100644 index 594e79d7c5..0000000000 --- a/package/gtest/gtest.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib/ -includedir=${prefix}/include - -Name: gtest -Description: Google C++ Testing Framework -Version: 1.8.0 -Libs: -L${libdir} -lgtest -Libs.private: -lpthread -Cflags: -I${includedir}