aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorBrett Gilio <brettg@gnu.org>2020-12-20 14:57:37 -0600
committerBrett Gilio <brettg@gnu.org>2020-12-20 14:57:37 -0600
commitb6d96be80c6bc8b11eccbd68ff0824ccaf03f4e5 (patch)
tree4ff91fea8951509545dc7329f8952ddd42955199 /gnu/packages/patches
parenta0cebd176a1cd986d12310a9c1db8293c1e2b755 (diff)
downloadguix-b6d96be80c6bc8b11eccbd68ff0824ccaf03f4e5.tar.gz
guix-b6d96be80c6bc8b11eccbd68ff0824ccaf03f4e5.zip
gnu: bear: Update to 3.0.4.
* gnu/local.mk (bear-disable-preinstall-tests.patch): Add patch. * gnu/packages/build-tools.scm (bear): Reference patch, and update.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/bear-disable-preinstall-tests.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/gnu/packages/patches/bear-disable-preinstall-tests.patch b/gnu/packages/patches/bear-disable-preinstall-tests.patch
new file mode 100644
index 0000000000..c65095405f
--- /dev/null
+++ b/gnu/packages/patches/bear-disable-preinstall-tests.patch
@@ -0,0 +1,40 @@
+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
++++ b/CMakeLists.txt
+@@ -58,10 +58,6 @@ ExternalProject_Add(BearSource
+ -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+ -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+ -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
+- TEST_BEFORE_INSTALL
+- 1
+- TEST_COMMAND
+- ctest # or `ctest -T memcheck`
+ )
+
+ # Run the functional tests
+@@ -73,12 +69,8 @@ if (ENABLE_FUNC_TESTS)
+ BearSource
+ CMAKE_CACHE_ARGS
+ -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
+- TEST_BEFORE_INSTALL
+- 1
+ INSTALL_COMMAND
+ ""
+- TEST_COMMAND
+- ctest --verbose
+ )
+ endif ()
+
+--
+2.29.2
+