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-loongson-workaround.patch \
%D%/packages/patches/binutils-mingw-w64-deterministic.patch \ %D%/packages/patches/binutils-mingw-w64-deterministic.patch \
%D%/packages/patches/binutils-2.41-fix-cross.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/bloomberg-bde-tools-fix-install-path.patch \
%D%/packages/patches/boolector-find-googletest.patch \ %D%/packages/patches/boolector-find-googletest.patch \
%D%/packages/patches/boost-fix-duplicate-definitions-bug.patch \ %D%/packages/patches/boost-fix-duplicate-definitions-bug.patch \

View file

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