From 01eb317b9e96de312bc99f10bd5699e97c76b958 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 8 Oct 2021 19:06:02 +0000 Subject: gnu: bear: Update to 3.0.16. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/build-tools.scm (bear): Update to 3.0.16. * gnu/packages/patches/bear-disable-preinstall-tests.patch: Update. Signed-off-by: Ludovic Courtès --- .../patches/bear-disable-preinstall-tests.patch | 24 +++++----------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'gnu/packages/patches/bear-disable-preinstall-tests.patch') diff --git a/gnu/packages/patches/bear-disable-preinstall-tests.patch b/gnu/packages/patches/bear-disable-preinstall-tests.patch index c65095405f..ffb31c28f1 100644 --- a/gnu/packages/patches/bear-disable-preinstall-tests.patch +++ b/gnu/packages/patches/bear-disable-preinstall-tests.patch @@ -1,20 +1,9 @@ -From d7d0cdd48017679e8529f8475d1b9902944cf243 Mon Sep 17 00:00:00 2001 -From: Brett Gilio -Date: Sun, 20 Dec 2020 14:43:30 -0600 -Subject: [PATCH] Disallow Pre-install Checks - ---- - CMakeLists.txt | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c6d27..73b4ace 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -58,10 +58,6 @@ ExternalProject_Add(BearSource - -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} +@@ -60,10 +60,6 @@ ExternalProject_Add(BearSource -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS} + -DENABLE_FUNC_TESTS:BOOL=${ENABLE_FUNC_TESTS} - TEST_BEFORE_INSTALL - 1 - TEST_COMMAND @@ -22,9 +11,9 @@ index 45c6d27..73b4ace 100644 ) # Run the functional tests -@@ -73,12 +69,8 @@ if (ENABLE_FUNC_TESTS) - BearSource - CMAKE_CACHE_ARGS +@@ -77,12 +73,8 @@ if (ENABLE_FUNC_TESTS) + -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX} - TEST_BEFORE_INSTALL - 1 @@ -35,6 +24,3 @@ index 45c6d27..73b4ace 100644 ) endif () --- -2.29.2 - -- cgit 1.4.1 From de01d08bdfca8533285da16941bfcade49a7070d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Dec 2021 00:22:19 +0100 Subject: gnu: bear: Update to 3.0.17. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/build-tools.scm (bear): Update to 3.0.17. [source]: Remove patch, and… [arguments]: …replace it with a new 'disable-TEST_BEFORE_INSTALL phase. Don't explicitly return #t from other phases. * gnu/packages/patches/bear-disable-preinstall-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/build-tools.scm | 32 ++++++++++++---------- .../patches/bear-disable-preinstall-tests.patch | 26 ------------------ 3 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 gnu/packages/patches/bear-disable-preinstall-tests.patch (limited to 'gnu/packages/patches/bear-disable-preinstall-tests.patch') diff --git a/gnu/local.mk b/gnu/local.mk index 6ef4278e19..0bae6ffa63 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -885,7 +885,6 @@ dist_patch_DATA = \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/bc-fix-cross-compilation.patch \ %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \ - %D%/packages/patches/bear-disable-preinstall-tests.patch \ %D%/packages/patches/bind-re-add-attr-constructor-priority.patch \ %D%/packages/patches/brightnessctl-elogind-support.patch \ %D%/packages/patches/bsd-games-2.17-64bit.patch \ diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index d36f7d6bb5..eb6c32d849 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Corentin Bocquillon -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018, 2020 Marius Bakke @@ -102,25 +102,27 @@ makes a few sacrifices to acquire fast full and incremental build times.") (define-public bear (package (name "bear") - (version "3.0.16") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rizsotto/Bear") - (commit version))) - (file-name (git-file-name name version)) - (patches (search-patches - "bear-disable-preinstall-tests.patch")) - (sha256 - (base32 - "01giv11nhjp4pvw8ssf8bxf503pabwnwnvfzmrxyxixnairwmykg")))) + (version "3.0.17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rizsotto/Bear") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0klbk99qphibrp2944w8gn6x1dwwgrbm7f2bh530wjp5h3bpkr45")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-TEST_BEFORE_INSTALL + (lambda _ + (substitute* "CMakeLists.txt" + ;; Delete the matching line—and comment out the next. + ((".*TEST_(BEFORE_INSTALL|COMMAND).*") "#")))) (add-before 'check 'set-build-environment (lambda _ - (setenv "CC" "gcc") - #t)) + (setenv "CC" "gcc"))) ;; TODO: Test Configuration is Incomplete (replace 'check (lambda _ diff --git a/gnu/packages/patches/bear-disable-preinstall-tests.patch b/gnu/packages/patches/bear-disable-preinstall-tests.patch deleted file mode 100644 index ffb31c28f1..0000000000 --- a/gnu/packages/patches/bear-disable-preinstall-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,10 +60,6 @@ ExternalProject_Add(BearSource - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} - -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS} - -DENABLE_FUNC_TESTS:BOOL=${ENABLE_FUNC_TESTS} -- TEST_BEFORE_INSTALL -- 1 -- TEST_COMMAND -- ctest # or `ctest -T memcheck` - ) - - # Run the functional tests -@@ -77,12 +73,8 @@ if (ENABLE_FUNC_TESTS) - -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} - -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} - -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX} -- TEST_BEFORE_INSTALL -- 1 - INSTALL_COMMAND - "" -- TEST_COMMAND -- ctest --verbose - ) - endif () - -- cgit 1.4.1