gnu: bloomberg-bde: Update to 4.27.0.0.

* gnu/packages/cpp.scm (bloomberg-bde): Update to 4.27.0.0.
[source](origin): Remove test deletion snippet.
<patches>: Remove bloomberg-bde-cmake-module-path.patch.
[arguments]<#:parallel-tests>: Delete.
<#:test-exclude>: Add failing tests.
<#:phases>: Rewrite 'build-tests to call gnu-build-system's 'build
phase.
* gnu/local.mk: Remove patch.
* gnu/packages/patches/bloomberg-bde-cmake-module-path.patch: Delete.

Change-Id: I8f07889d5908a29e7d732af20937c4f7ad1f703e
This commit is contained in:
Greg Hogan 2025-07-15 13:19:02 +00:00
parent 702a7053e6
commit 8d49db6183
No known key found for this signature in database
GPG key ID: EF6EB27413CFEEF3
3 changed files with 52 additions and 73 deletions

View file

@ -1076,7 +1076,6 @@ dist_patch_DATA = \
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/binutils-mingw-w64-deterministic.patch \
%D%/packages/patches/binutils-2.41-fix-cross.patch \
%D%/packages/patches/bloomberg-bde-cmake-module-path.patch \
%D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \
%D%/packages/patches/boolector-find-googletest.patch \
%D%/packages/patches/boost-fix-duplicate-definitions-bug.patch \

View file

@ -3270,23 +3270,18 @@ validation.")
(license license:asl2.0)))
(define-public bloomberg-bde
(let ((commit "445a8ac4223b90ee0a46749b87ffbbd21788e132"))
(package
(name "bloomberg-bde")
;; Recent releases are not tagged so commit must be used for checkout.
(version "4.14.0.0")
(version "4.27.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/bloomberg/bde")
(commit commit)))
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1hf09d4fcn77s1vv6qrh0sa0rv9wijpk55km6p3zi2ymkb2cha3c"))
(patches
(search-patches
"bloomberg-bde-cmake-module-path.patch"))
"17315r9j20pvv4ccnd59m85miq96hp07pysfr64glb7r4f4zjkfs"))
;;(modules '((guix build utils)))
(snippet
`(begin
@ -3294,32 +3289,31 @@ validation.")
;; may be patched or modified from upstream sources.
;;(for-each delete-file-recursively
;; (list "thirdparty"))
;; Delete failing tests.
(for-each
delete-file
(list "groups/bal/balcl/balcl_commandline.t.cpp"
"groups/bal/balst/balst_resolver_filehelper.t.cpp"
"groups/bal/balst/balst_stacktraceprintutil.t.cpp"
"groups/bal/balst/balst_stacktraceutil.t.cpp"
"groups/bsl/bslh/bslh_hash.t.cpp"
"groups/bsl/bsls/bsls_timeutil.t.cpp"))
#t))))
))))
(build-system cmake-build-system)
(arguments
`(#:parallel-tests? #f ; Test parallelism may fail inconsistently.
(list
;; Set UFID to build shared libraries. Flag descriptions can be found at
;; https://bloomberg.github.io/bde-tools/bbs/reference/bbs_build_configuration.html#ufid
#:configure-flags '("-DUFID=opt_dbg_exc_mt_64_shr_cpp20")
#:configure-flags #~(list "-DUFID=opt_dbg_exc_mt_64_shr_cpp20")
#:test-exclude (string-join (list "balcl_commandline.t"
"balst_stacktraceprintutil.t"
"bslalg_numericformatterutil.t"
"bslh_hash.t"
"bslstl_deque.0[1345].t"
"bslstl_queue.t"
"bslstl_stack.t")
"|")
#:modules '((guix build cmake-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases
(modify-phases %standard-phases
;; Explicitly build tests separate from the main build.
#~(modify-phases %standard-phases
;; Explicitly build tests after the main build.
(add-after 'build 'build-tests
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "all.t"
`(,@(if #:parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags)))))))
(lambda* (#:key make-flags #:allow-other-keys #:rest args)
(apply (assoc-ref gnu:%standard-phases 'build)
(list #:make-flags (list "all.t"))))))))
(native-inputs
(list bloomberg-bde-tools pkg-config python))
(synopsis "Foundational C++ libraries used at Bloomberg")
@ -3331,7 +3325,7 @@ multi-threaded applications and network applications.")
(home-page "https://github.com/bloomberg/bde")
;; Out-of-memory on i686-linux, compile errors with non-x86.
(supported-systems '("x86_64-linux"))
(license license:asl2.0))))
(license license:asl2.0)))
(define-public gulrak-filesystem
(package

View file

@ -1,14 +0,0 @@
This package requires CMAKE_MODULE_PATH be set by the calling process. This
patch uses the CMAKE_PREFIX_PATH passed from Guix as the search path for
locating the bloomberg-bde-tools CMake modules.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ else()
if (NOT CMAKE_MODULE_PATH)
message(FATAL "Please specify path to BDE cmake modules.")
endif()
+ string(REPLACE ":" "cmake/;" CMAKE_MODULE_PATH "$ENV{CMAKE_PREFIX_PATH}cmake/")
include(bde_workspace)