me/guix
Archived
1
0
Fork 0
Code Activity

gnu: bear: Update to 3.0.16.

Browse source 
* 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 <ludo@gnu.org>
This commit is contained in:
Greg Hogan 2021-10-08 19:06:02 +00:00 • committed by Ludovic Courtès
parent 459d7cfbc4
commit 01eb317b9e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/build-tools.scm
View file

@ -103,7 +103,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(define-public bear (define-public bear
(package (package
(name "bear") (name "bear")
(version "3.0.4") (version "3.0.16")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -114,7 +114,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
"bear-disable-preinstall-tests.patch")) "bear-disable-preinstall-tests.patch"))
(sha256 (sha256
(base32 (base32
"15r22sbk5bibrhf54lf0shiqw1gnsik24fr5as96w3hnj6iahgwn")))) "01giv11nhjp4pvw8ssf8bxf503pabwnwnvfzmrxyxixnairwmykg"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

24
gnu/packages/patches/bear-disable-preinstall-tests.patch
View file

@ -1,20 +1,9 @@
From d7d0cdd48017679e8529f8475d1b9902944cf243 Mon Sep 17 00:00:00 2001
From: Brett Gilio <brettg@gnu.org>
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 --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -58,10 +58,6 @@ ExternalProject_Add(BearSource @@ -60,10 +60,6 @@ ExternalProject_Add(BearSource
-DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS} -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
-DENABLE_FUNC_TESTS:BOOL=${ENABLE_FUNC_TESTS}
- TEST_BEFORE_INSTALL - TEST_BEFORE_INSTALL
- 1 - 1
- TEST_COMMAND - TEST_COMMAND
@ -22,9 +11,9 @@ index 45c6d27..73b4ace 100644
) )
# Run the functional tests # Run the functional tests
@@ -73,12 +69,8 @@ if (ENABLE_FUNC_TESTS) @@ -77,12 +73,8 @@ if (ENABLE_FUNC_TESTS)
BearSource -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
-DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX} -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
- TEST_BEFORE_INSTALL - TEST_BEFORE_INSTALL
- 1 - 1
@ -35,6 +24,3 @@ index 45c6d27..73b4ace 100644
) )
endif () endif ()
--
2.29.2