mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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:
parent
702a7053e6
commit
8d49db6183
3 changed files with 52 additions and 73 deletions
|
@ -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 \
|
||||||
|
|
|
@ -3270,23 +3270,18 @@ 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 commit)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1hf09d4fcn77s1vv6qrh0sa0rv9wijpk55km6p3zi2ymkb2cha3c"))
|
"17315r9j20pvv4ccnd59m85miq96hp07pysfr64glb7r4f4zjkfs"))
|
||||||
(patches
|
|
||||||
(search-patches
|
|
||||||
"bloomberg-bde-cmake-module-path.patch"))
|
|
||||||
;;(modules '((guix build utils)))
|
;;(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
`(begin
|
`(begin
|
||||||
|
@ -3294,32 +3289,31 @@ validation.")
|
||||||
;; may be patched or modified from upstream sources.
|
;; may be patched or modified from upstream sources.
|
||||||
;;(for-each delete-file-recursively
|
;;(for-each delete-file-recursively
|
||||||
;; (list "thirdparty"))
|
;; (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)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:parallel-tests? #f ; Test parallelism may fail inconsistently.
|
(list
|
||||||
;; Set UFID to build shared libraries. Flag descriptions can be found at
|
;; 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
|
;; 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
|
#:phases
|
||||||
(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
;; Explicitly build tests separate from the main build.
|
;; Explicitly build tests after the main build.
|
||||||
(add-after 'build 'build-tests
|
(add-after 'build 'build-tests
|
||||||
(lambda* (#:key make-flags #:allow-other-keys)
|
(lambda* (#:key make-flags #:allow-other-keys #:rest args)
|
||||||
(apply invoke "make" "all.t"
|
(apply (assoc-ref gnu:%standard-phases 'build)
|
||||||
`(,@(if #:parallel-build?
|
(list #:make-flags (list "all.t"))))))))
|
||||||
`("-j" ,(number->string (parallel-job-count)))
|
|
||||||
'())
|
|
||||||
,@make-flags)))))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list bloomberg-bde-tools pkg-config python))
|
(list bloomberg-bde-tools pkg-config python))
|
||||||
(synopsis "Foundational C++ libraries used at Bloomberg")
|
(synopsis "Foundational C++ libraries used at Bloomberg")
|
||||||
|
@ -3331,7 +3325,7 @@ 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
|
||||||
|
|
|
@ -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)
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue