From 309025840068cd136232db5a9c76c565164eee3c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 19 Oct 2023 18:13:40 +0200 Subject: [PATCH 1/2] bee-cache: Add '[' to ere_quote Add '[' to the set of characters which need escaping when used in a regular expression. --- src/bee-cache.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bee-cache.sh.in b/src/bee-cache.sh.in index b1e2b2e..243844d 100644 --- a/src/bee-cache.sh.in +++ b/src/bee-cache.sh.in @@ -36,7 +36,7 @@ VERSION=${BEE_VERSION} : ${BEECACHE_INVENTORY=${BEECACHE_CACHEDIR}/INVENTORY} function ere_quote() { - sed 's/[]\.|$(){}?+*^]/\\&/g' <<< "$*" + sed 's/[][\.|$(){}?+*^]/\\&/g' <<< "$*" } function cache_verify() { From 5cc3440037f57d0582440ee79d1a18c3ee48375f Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 21 Nov 2023 13:00:49 +0100 Subject: [PATCH 2/2] buildtypes: Set default for cmake build type cmake, by default, uses CMAKE_BULD_TYPE=Debug with implies '-O0'. This has a severe performance impact for most software. Let bee use CMAKE_BULD_TYPE=RelWithDebInfo by default, which implies '-O2'. For most software, the difference between '-O2' and '-O3' is neglectable. Bee packages with special performance considerations, for example zlib, might use -DCMAKE_BUILD_TYPE=Release in their bee file to force '-O3'. --- buildtypes/cmake.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/buildtypes/cmake.sh.in b/buildtypes/cmake.sh.in index d8c13bc..0ea7ce0 100644 --- a/buildtypes/cmake.sh.in +++ b/buildtypes/cmake.sh.in @@ -44,6 +44,7 @@ bee_configure() { -DCMAKE_INSTALL_LIBDIR=${LIBDIR} \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ "${@}" \ ${BEE_BUILDTYPE_CMAKE_SOURCEDIR} }