From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UtuiDGfZkl8qLAAA0tVLHw (envelope-from ) for ; Fri, 23 Oct 2020 13:23:51 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id gL6XBmfZkl90SQAA1q6Kng (envelope-from ) for ; Fri, 23 Oct 2020 13:23:51 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 950B99402A8 for ; Fri, 23 Oct 2020 13:23:50 +0000 (UTC) Received: from localhost ([::1]:50074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVx2r-0005EJ-7l for larch@yhetil.org; Fri, 23 Oct 2020 09:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVx18-0003gc-Ih for guix-patches@gnu.org; Fri, 23 Oct 2020 09:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVx18-00019e-90 for guix-patches@gnu.org; Fri, 23 Oct 2020 09:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kVx18-00040r-5P for guix-patches@gnu.org; Fri, 23 Oct 2020 09:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44177] [PATCH] gnu: benchmark: Update to 1.5.2 Resent-From: Malte Frank Gerdes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Oct 2020 13:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44177 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44177@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160345929415388 (code B ref -1); Fri, 23 Oct 2020 13:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Oct 2020 13:21:34 +0000 Received: from localhost ([127.0.0.1]:56365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVx0d-000405-Qi for submit@debbugs.gnu.org; Fri, 23 Oct 2020 09:21:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:33084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVx0Y-0003zs-8N for submit@debbugs.gnu.org; Fri, 23 Oct 2020 09:21:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVx0X-0002sW-VI for guix-patches@gnu.org; Fri, 23 Oct 2020 09:21:26 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:36517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVx0S-00016s-EQ for guix-patches@gnu.org; Fri, 23 Oct 2020 09:21:25 -0400 Received: by mail-ej1-x62f.google.com with SMTP id w27so2370246ejb.3 for ; Fri, 23 Oct 2020 06:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:user-agent:mime-version; bh=imoevjrFr9tInCKz6k0LfozP76XVcDALcJU62+SX4iM=; b=P45YwD5InbAeQtgBo7Ixz1y+q1yqrHkv8MmE3KAdQjFVfV0c2mnqXX/Tn/+irgcGSL 7Jo3Wpg+bW32LxTJu2TM+NLM4rSLkhpdwNbHc/c/uhgdCpbVK/37JbxLsblPW+3EOW1F vl6n2oPFzZ864fFLBogvzsrJiK342VRhsfiL1YWjtIPEZyECdox89EKgZUrB0aKo4rwX KAsuTQuPoXk5u8E9QXrOixS36RmrQ+Z4fCYPV0vml4sBhJ+coIUvFq+AyC+V/YJ2U6G+ k6rddixV0nSSH0jDxlxtvabapM9a0STYOjpO+zbjbVtxzxKJnnDUdXS3Ve28nRp/qg28 Rj1w== 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:user-agent :mime-version; bh=imoevjrFr9tInCKz6k0LfozP76XVcDALcJU62+SX4iM=; b=q3PSUPtOPaeYtV4lu5pGiist+5jiDjKFa8OfIR3WTweaKwE3IgySnzTop5Hx7KSZIy tyPsqqOW+EJcEFJsOYMtks1PTpeO/rzSnxC1KRgvyMuf34EHO/IHPRxxVGxYwNf9ecDA YFt0oE3y1EGl9yjFMq+Z9QUxQYXtYpRjNhfxbk/9OPTTclAUvBMPfcTIyEdt3OoCQ5mn 8gWr6ZSZHEVgu6PDGWJ1SiQKuXfCcGYqtczBEFZVxhjAM5KPVPhOc9VnqBdQ5oDb2tCu vZSLN/ItUt5uvtF+4QhipXEHrC3XonKTqVs3Iku6P6uevZEXHPcQ7VFfWP8vWzu3WRf7 89Eg== X-Gm-Message-State: AOAM533H9isBBxBkNEZUtr4MnooX0pHasaZgqlaOlJF+Y3xkZvSTrnbf YNuUBXymo4yACBt/LlJkYNAzLbCGBRs= X-Google-Smtp-Source: ABdhPJzIiC9d1mMEXgsKCzSysOghYRgTueFiWZUsOEiIzZogo75uWDdweE+J3Gj6tgJ005wsDmmDAA== X-Received: by 2002:a17:906:bfe2:: with SMTP id vr2mr2015326ejb.248.1603459278324; Fri, 23 Oct 2020 06:21:18 -0700 (PDT) Received: from Morphium (ip-84-118-73-55.unity-media.net. [84.118.73.55]) by smtp.gmail.com with ESMTPSA id m6sm898557ejl.94.2020.10.23.06.21.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 06:21:17 -0700 (PDT) From: Malte Frank Gerdes Date: Fri, 23 Oct 2020 15:21:16 +0200 Message-ID: <86eelpf583.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=malte.f.gerdes@gmail.com; helo=mail-ej1-x62f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=P45YwD5I; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: G7NzWPfLzifj --=-=-= Content-Type: text/plain Hi, this updates benchmark to version 1.5.2 - i noticed that there was a patch to "unbundle" googletest from benchmark. I don't know what the intention was, but benchmark searches for googletest in $BUILD_DIR/googletest which doesn't exist. So googletest isn't actually bundled as it seems to me. So i removed that patch. Malte --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-benchmark-Update-to-1.5.2.patch Content-Transfer-Encoding: quoted-printable >From bcacd4e0bc4058b698be6a798adcd668d7ef1002 Mon Sep 17 00:00:00 2001 From: Malte Frank Gerdes Date: Fri, 23 Oct 2020 15:11:52 +0200 Subject: [PATCH] gnu: benchmark: Update to 1.5.2 * gnu/packages/benchmark.scm (benchmark): Update to 1.5.2 [native-inputs]: Add googletest-source. [arguments]: Add phase 'unpack-googletest. * gnu/packages/patches/benchmark-unbundle-googletst.patch: Delete file. * gnu/packages/local.mk: Remove benchmark-unbundle-googletest.patch. --- gnu/local.mk | 1 - gnu/packages/benchmark.scm | 21 ++++-- .../benchmark-unbundle-googletest.patch | 69 ------------------- 3 files changed, 15 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/benchmark-unbundle-googletest.patch diff --git a/gnu/local.mk b/gnu/local.mk index 31385d0db6..013bc58db7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -825,7 +825,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/beets-werkzeug-compat.patch \ %D%/packages/patches/behave-skip-a-couple-of-tests.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ - %D%/packages/patches/benchmark-unbundle-googletest.patch \ %D%/packages/patches/biber-fix-encoding-write.patch \ %D%/packages/patches/biber-sortinithash.patch \ %D%/packages/patches/bidiv-update-fribidi.patch \ diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index f9648b5f7c..8a8309ce52 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2019 G=C3=A1bor Boskovits ;;; Copyright =C2=A9 2019 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2020 Vincent Legoll +;;; Copyright =C2=A9 2020 malte Frank Gerdes ;;; ;;; This file is part of GNU Guix. ;;; @@ -213,7 +214,7 @@ This can give a much better understanding of the comman= d's performance.") (define-public benchmark (package (name "benchmark") - (version "1.5.0") + (version "1.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -222,16 +223,24 @@ This can give a much better understanding of the comm= and's performance.") (file-name (git-file-name name version)) (sha256 (base32 - "0r9dbg4cbk47gwmayys31a83m3y67k0kh1f6pl8i869rbd609ndh")) - (patches (search-patches "benchmark-unbundle-googletest.patc= h")))) + "13rxagpzw6bal6ajlmrxlh9kgfvcixn6j734b2bvfqz7lch8n0pa")))) (build-system cmake-build-system) (native-inputs - `(("googletest" ,googletest))) + `(("googletest-source" ,(package-source googletest)) + ("googletest" ,googletest))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-googletest + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "googletest-source") + "googletest") + #t))))) (home-page "https://github.com/google/benchmark") (synopsis "Microbenchmark support library") (description - "Benchmark is a library to benchmark code snippets, -similar to unit tests.") + "Benchmark is a library to benchmark code snippets, similar to unit +tests.") (license license:asl2.0))) =20 (define-public bonnie++ diff --git a/gnu/packages/patches/benchmark-unbundle-googletest.patch b/gnu= /packages/patches/benchmark-unbundle-googletest.patch deleted file mode 100644 index 4dce8f59f1..0000000000 --- a/gnu/packages/patches/benchmark-unbundle-googletest.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 5eb306618196ea78b8c9390e22ea2edce20760fe Mon Sep 17 00:00:00 2001 -From: =3D?UTF-8?q?G=3DC3=3DA1bor=3D20Boskovits?=3D -Date: Fri, 14 Jun 2019 22:15:49 +0200 -Subject: [PATCH] Remove googletest lookup from build system. - ---- - cmake/GoogleTest.cmake | 18 +++++++++--------- - cmake/GoogleTest.cmake.in | 12 ++++++------ - 2 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/cmake/GoogleTest.cmake b/cmake/GoogleTest.cmake -index fb7c6be..a6c473b 100644 ---- a/cmake/GoogleTest.cmake -+++ b/cmake/GoogleTest.cmake -@@ -27,15 +27,15 @@ endif() - # settings on Windows - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -=20 --include(${GOOGLETEST_PREFIX}/googletest-paths.cmake) -+#include(${GOOGLETEST_PREFIX}/googletest-paths.cmake) -=20 - # Add googletest directly to our build. This defines - # the gtest and gtest_main targets. --add_subdirectory(${GOOGLETEST_SOURCE_DIR} -- ${GOOGLETEST_BINARY_DIR} -- EXCLUDE_FROM_ALL) -- --set_target_properties(gtest PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORI= ES $) --set_target_properties(gtest_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRE= CTORIES $) --set_target_properties(gmock PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORI= ES $) --set_target_properties(gmock_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRE= CTORIES $) -+#add_subdirectory(${GOOGLETEST_SOURCE_DIR} -+# ${GOOGLETEST_BINARY_DIR} -+# EXCLUDE_FROM_ALL) -+ -+#set_target_properties(gtest PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTOR= IES $) -+#set_target_properties(gtest_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIR= ECTORIES $) -+#set_target_properties(gmock PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTOR= IES $) -+#set_target_properties(gmock_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIR= ECTORIES $) -diff --git a/cmake/GoogleTest.cmake.in b/cmake/GoogleTest.cmake.in -index 28818ee..13b0888 100644 ---- a/cmake/GoogleTest.cmake.in -+++ b/cmake/GoogleTest.cmake.in -@@ -31,7 +31,7 @@ if(EXISTS "${GOOGLETEST_PATH}" AND IS_DIRECTO= RY "${GOOGLETEST_PATH}" - ) - else() - if(NOT ALLOW_DOWNLOADING_GOOGLETEST) -- message(SEND_ERROR "Did not find Google Test sources! Either pass cor= rect path in GOOGLETEST_PATH, or enable ALLOW_DOWNLOADING_GOOGLETEST, or di= sable BENCHMARK_ENABLE_GTEST_TESTS / BENCHMARK_ENABLE_TESTING.") -+ message(WARNING "Did not find Google Test sources! Either pass correc= t path in GOOGLETEST_PATH, or enable ALLOW_DOWNLOADING_GOOGLETEST, or disab= le BENCHMARK_ENABLE_GTEST_TESTS / BENCHMARK_ENABLE_TESTING.") - else() - message(WARNING "Did not find Google Test sources! Fetching from web.= ..") - ExternalProject_Add( -@@ -51,8 +51,8 @@ else() - endif() - endif() -=20 --ExternalProject_Get_Property(googletest SOURCE_DIR BINARY_DIR) --file(WRITE googletest-paths.cmake --"set(GOOGLETEST_SOURCE_DIR \"${SOURCE_DIR}\") --set(GOOGLETEST_BINARY_DIR \"${BINARY_DIR}\") --") -+#ExternalProject_Get_Property(googletest SOURCE_DIR BINARY_DIR) -+#file(WRITE googletest-paths.cmake -+#"set(GOOGLETEST_SOURCE_DIR \"${SOURCE_DIR}\") -+#set(GOOGLETEST_BINARY_DIR \"${BINARY_DIR}\") -+#") ---=20 -2.22.0 - --=20 2.28.0 --=-=-=--