From patchwork Fri Feb 4 21:23:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 37002 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BC5F227BBEA; Fri, 4 Feb 2022 21:40:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HTML_MESSAGE,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A723227BBE9 for ; Fri, 4 Feb 2022 21:40:00 +0000 (GMT) Received: from localhost ([::1]:39810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG6JD-0002Y9-Rb for patchwork@mira.cbaines.net; Fri, 04 Feb 2022 16:39:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG63r-0001HS-Ln for guix-patches@gnu.org; Fri, 04 Feb 2022 16:24:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG63n-00050n-65 for guix-patches@gnu.org; Fri, 04 Feb 2022 16:24:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nG63l-0003HK-Rc for guix-patches@gnu.org; Fri, 04 Feb 2022 16:24:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51592] [PATCH 0/2] gnu: Add bloomberg-bde. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Feb 2022 21:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51592 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 51592@debbugs.gnu.org Received: via spool by 51592-submit@debbugs.gnu.org id=B51592.164400983512591 (code B ref 51592); Fri, 04 Feb 2022 21:24:01 +0000 Received: (at 51592) by debbugs.gnu.org; 4 Feb 2022 21:23:55 +0000 Received: from localhost ([127.0.0.1]:33015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG63Z-0003Gr-6I for submit@debbugs.gnu.org; Fri, 04 Feb 2022 16:23:55 -0500 Received: from mail-pj1-f41.google.com ([209.85.216.41]:36765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG63W-0003Ge-Tk for 51592@debbugs.gnu.org; Fri, 04 Feb 2022 16:23:48 -0500 Received: by mail-pj1-f41.google.com with SMTP id h20-20020a17090adb9400b001b518bf99ffso14242742pjv.1 for <51592@debbugs.gnu.org>; Fri, 04 Feb 2022 13:23:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=hnApk5CLSw7pL5M+4gCJOrGEHYSCoYbl5+ZQY3we7aI=; b=UaWt/5HB7ZacCT0l2NrKYVJn1DnlydAqnCZK6+25Qr586SF/Rq/v5OdKkP9pYXf09/ 5EizbPVH+2jUaUc7hWPe9zthhl2yKR/3RolmKnPDDQGeQv+/Eo85MXXGHDGJH8SIX7IK p2VFqxWvIT6oUmNRq67xwglcIwI2dirzFP0C/Mn4hA5c9AfhriAA/GdIRJareQhA9lth XVg3/Hs+JpawEvJag5bK20Bg0Db1cfj97qKhHnUGuFANZ9d6B1nQ6El+VLwig7s/yOtz ovkYOiN1SX1qM9q6z2MYi5+sNYrzzwRLMQxdbqFcetiY9gE15ewP3F3KY/JWlDljlhMa Wd7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hnApk5CLSw7pL5M+4gCJOrGEHYSCoYbl5+ZQY3we7aI=; b=MiWr5R19X1X5zGBIGOfjRl7XC9cg9qlUI2e3bdIbRL4LAKWOBuAza2YDLKW/7jrXqn gM3n5BLoVG47L5jaCR8bcPusSSTgmc85ISXAAFpGn+aNxgoBT4EAs5UqI/HLr5wGuh/v uZ0pWBZ2Yq9HnpA1vvGIVpiYArSv3gRWPoMC09nUOlLn3f29FfAePT7YhfRQa1Ekp9zn P50hfmcXK1pIlnBRkQJc9YO6c78VKnQSGjfIeBR28tTbAJUmsrM0vf9+v0wGCJzvhMON psrKrYzem6LKmOm8Dam6ATodwvgB6NYe9LSuA/8GzLkH12F2ja0KsSNk5hFO2PCgAQON 2EUA== X-Gm-Message-State: AOAM531tO7JQoArwre5CbG3KEBb/6vHe3lIEGgMe3z9d/rQ+UH6lo8Y2 BRv13RFKOIjiZ1MZRFNPT1mp9gqPY1FpSsG+8MvCiQ== X-Google-Smtp-Source: ABdhPJwNrqJHJmS27QYLE9CA3o4CnP3rZoiroyFAf3cgCr4CKOQiDpZqH+trEnlsftTdH2XvXaPoekbCHUK/rAxoYTg= X-Received: by 2002:a17:90b:4d11:: with SMTP id mw17mr5269610pjb.9.1644009820691; Fri, 04 Feb 2022 13:23:40 -0800 (PST) MIME-Version: 1.0 References: <871r2w2ukh.fsf@gnu.org> In-Reply-To: From: Greg Hogan Date: Fri, 4 Feb 2022 16:23:29 -0500 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I have updated the attached patches to the latest versioned commits. I believe the recommended fixes are all in place. Thanks, Greg > From 5b6114f4ee2c3801858d2984d706a490cd34f50e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 3 Nov 2021 15:22:19 +0000 Subject: [PATCH 2/2] gnu: Add bloomberg-bde. * gnu/packages/cpp.scm (bloomberg-bde): New variable. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 75 ++++++++++++++++++- .../bloomberg-bde-cmake-module-path.patch | 16 ++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/bloomberg-bde-cmake-module-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index b533002407..4b194604db 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -911,6 +911,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-mingw-w64-timestamp.patch \ %D%/packages/patches/binutils-mingw-w64-deterministic.patch \ %D%/packages/patches/binutils-CVE-2021-45078.patch \ + %D%/packages/patches/bloomberg-bde-cmake-module-path.patch \ %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \ %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ %D%/packages/patches/byobu-writable-status.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index b8c89813d1..86ac3c8e39 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -80,7 +80,8 @@ (define-module (gnu packages cpp) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages tls) #:use-module (gnu packages web) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (ice-9 match)) (define-public argagg (let ((commit "79e4adfa2c6e2bfbe63da05cc668eb9ad5596748") (revision "0")) @@ -1613,3 +1614,75 @@ (define-public bloomberg-bde-tools "This package provides the cmake imports needed to build bloomberg-bde.") (home-page "https://github.com/bloomberg/bde-tools") (license license:asl2.0)))) + +(define-public bloomberg-bde + (let ((commit "b6bcc0e24a5862bf77aea7edd831dedf50e21d64")) + (package + (name "bloomberg-bde") + ;; Recent releases are not tagged so commit must be used for checkout. + (version "3.98.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bloomberg/bde") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y3lipi1lj9qazgc935851r2qsx5aq3vvc4y52jq57riyz8wg3ma")) + (patches + (search-patches + "bloomberg-bde-cmake-module-path.patch")) + ;;(modules '((guix build utils))) + (snippet + `(begin + ;; FIXME: Delete bundled software. The third-party packages + ;; 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/ball/ball_asyncfileobserver.t.cpp" + "groups/bal/ball/ball_fileobserver2.t.cpp" + "groups/bal/ball/ball_recordstringformatter.t.cpp" + "groups/bal/balst/balst_stacktraceutil.t.cpp" + "groups/bdl/bdlmt/bdlmt_eventscheduler.t.cpp" + "groups/bdl/bdlmt/bdlmt_timereventscheduler.t.cpp" + "groups/bdl/bdls/bdls_filesystemutil.t.cpp" + "groups/bsl/bslh/bslh_hashpair.t.cpp" + "groups/bsl/bsls/bsls_platform.t.cpp" + "groups/bsl/bsls/bsls_stackaddressutil.t.cpp" + "groups/bsl/bsls/bsls_stopwatch.t.cpp" + "groups/bsl/bslstl/bslstl_function_invokerutil.t.cpp")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:parallel-tests? #f ; Test parallelism may fail inconsistently. + ;; Set UFID to build shared libraries. Flag descriptions can be found at + ;; https://bloomberg.github.io/bde-tools/reference/bde_repo.html#ufid + #:configure-flags ,(match %current-system + ((or "i686-linux" "armhf-linux") + ''("-DUFID=opt_dbg_exc_mt_32_shr_cpp17")) + (_ + ''("-DUFID=opt_dbg_exc_mt_64_shr_cpp17"))) + #:phases + (modify-phases %standard-phases + ;; Explicitly build tests separate from 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))))))) + (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 +concepts (like dates and times), and building blocks for developing +multi-threaded applications and network applications.") + (home-page "https://github.com/bloomberg/bde") + (license license:asl2.0)))) diff --git a/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch b/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch new file mode 100644 index 0000000000..b08ca5eac0 --- /dev/null +++ b/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch @@ -0,0 +1,16 @@ +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 +@@ -1,8 +1,6 @@ + cmake_minimum_required(VERSION 3.15) + +-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/") + + get_filename_component(repoName ${CMAKE_CURRENT_LIST_DIR} NAME) + -- 2.34.0