From patchwork Wed May 17 15:16:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 50078 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 2D11D27BBE9; Wed, 17 May 2023 16:17:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 BFF9427BBE2 for ; Wed, 17 May 2023 16:17:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzItt-0001Qm-5G; Wed, 17 May 2023 11:17:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzItj-0001Q0-If for guix-patches@gnu.org; Wed, 17 May 2023 11:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzItj-0007Gx-78 for guix-patches@gnu.org; Wed, 17 May 2023 11:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzItj-0006ql-23 for guix-patches@gnu.org; Wed, 17 May 2023 11:17:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58143] [PATCH v2 2/2] gnu: bloomberg-bde: Update to 3.118.0.1. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 May 2023 15:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58143 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 58143@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 58143-submit@debbugs.gnu.org id=B58143.168433661226293 (code B ref 58143); Wed, 17 May 2023 15:17:03 +0000 Received: (at 58143) by debbugs.gnu.org; 17 May 2023 15:16:52 +0000 Received: from localhost ([127.0.0.1]:50667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzItX-0006q1-SX for submit@debbugs.gnu.org; Wed, 17 May 2023 11:16:52 -0400 Received: from mail-yw1-f176.google.com ([209.85.128.176]:58800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzItS-0006pM-Mz for 58143@debbugs.gnu.org; Wed, 17 May 2023 11:16:47 -0400 Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-561e5014336so3335687b3.1 for <58143@debbugs.gnu.org>; Wed, 17 May 2023 08:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20221208.gappssmtp.com; s=20221208; t=1684336601; x=1686928601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4hkIdHvhpGBDf2dCW/FkaQhBqzLu0xNj3kQ076fCYHg=; b=bJ/QTwdZS7aDK6w8eeDYiRjWfYdifibpU1FB6u8kCcvojr+ChQ0LoAQ6bXHBTG+IA7 0ewBxi8uN8TMfO1EwmmyBldMSKauao3Ab7/XPAwXyPu3Ps3YONfolO48EmicIqu/Lp/b hkLNY9ZMYs4CG7ToDiVVM93G5DdT1X6fPw84Kcmnaxu6Ra3gSoDT6+IVWt4dPKVuMBP2 dsm1u4/6M6ykQvuu0bhsH2eLEGQMSSXFnVAEKwwtkWOYQ8kvG2nlDgXBLRNRQe/1JwKm IuGCfBUa2SHzyug1ZlpHTOND1rlhJCqsyQhPdoBpa/JLyayzxdMwSl+4t9wxSAeVrUBk bR7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684336601; x=1686928601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4hkIdHvhpGBDf2dCW/FkaQhBqzLu0xNj3kQ076fCYHg=; b=Sx7fQREWWkhkHJ51udKO8qUN/xU4ZUA6KrFvi2KLxmIEYGWozSbFR6EhqM7fIRtp60 EqvJ8Ws/2Vbg8eK7QtdnQGs+k8FrDJLvFAFMXBqgxHgw0GpAdmupClO8NKXLDtAd+yRn z7iICa/dsco/buCGuf6d5HQWCaSo2znk5ESuA1FbLhhO45f4JN6TSLG4TIlKiMtrR6j6 Fcw5VrCsDe/tlWMR7tMtLHI4IKRkfsCQWnZujRAIzcTZOQrqWdP4wG3LfZL7akcwGPqe +1XJdm8DIXJZ/nLrvRwGz8WGIvRdDmbF5+QfvJqGiZM/Dn7k4x0U2szC/JTrhOgklSCy erzg== X-Gm-Message-State: AC+VfDxYRJu7SPc7fh09PvXzQ0zGQhAVNeYgc42ZT9tOd4LQUmcy6FIo d1Dc8T+O9BEdGITKoKn/mIcnZnKSRpgLY29KblqDaobD X-Google-Smtp-Source: ACHHUZ7HFWMHpdy4DvBQmodJeQ6Ku/4IjMr86I8bXzyNNUntCOuuTtt6mYY+3+qJdE/NUEdNAhyLdA== X-Received: by 2002:a81:4f12:0:b0:55a:985e:8ac9 with SMTP id d18-20020a814f12000000b0055a985e8ac9mr37238597ywb.22.1684336600899; Wed, 17 May 2023 08:16:40 -0700 (PDT) Received: from ip-172-31-16-142.us-east-2.compute.internal (ec2-18-118-46-115.us-east-2.compute.amazonaws.com. [18.118.46.115]) by smtp.gmail.com with ESMTPSA id z16-20020a0dd710000000b00559d9989490sm720958ywd.41.2023.05.17.08.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 08:16:40 -0700 (PDT) From: Greg Hogan Date: Wed, 17 May 2023 15:16:18 +0000 Message-Id: <20230517151618.267854-3-code@greghogan.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230517151618.267854-1-code@greghogan.com> References: <20230517151618.267854-1-code@greghogan.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (bloomberg-bde): Update to 3.118.0.1. [source](origin): Update test deletion list. [arguments]<#:configure-flags>: Update from C++17 to C++20. [supported-systems]: Only support x86_64-linux. * gnu/packages/patches/bloomberg-bde-cmake-module-path.patch: Rebase. --- gnu/packages/cpp.scm | 22 +++++++++++-------- .../bloomberg-bde-cmake-module-path.patch | 14 +++++------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 8698951ad2..88d0dde561 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2020,11 +2020,11 @@ (define-public bloomberg-bde-tools (license license:asl2.0)))) (define-public bloomberg-bde - (let ((commit "b6bcc0e24a5862bf77aea7edd831dedf50e21d64")) + (let ((commit "77a0f39d538c20ae28bece9a81cac99a9e1df95d")) (package (name "bloomberg-bde") ;; Recent releases are not tagged so commit must be used for checkout. - (version "3.98.0.0") + (version "3.118.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -2033,7 +2033,7 @@ (define-public bloomberg-bde (file-name (git-file-name name version)) (sha256 (base32 - "0y3lipi1lj9qazgc935851r2qsx5aq3vvc4y52jq57riyz8wg3ma")) + "0nw5clkc9yipd03kijh4c8lxi9zkxfxcjhszl1xzwvgz8xmpampf")) (patches (search-patches "bloomberg-bde-cmake-module-path.patch")) @@ -2050,26 +2050,28 @@ (define-public bloomberg-bde (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_stacktraceresolver_filehelper.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_hash.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/bsls/bsls_timeutil.t.cpp" + "groups/bsl/bslstl/bslstl_deque.1.t.cpp" + "groups/bsl/bslstl/bslstl_deque.2.t.cpp" + "groups/bsl/bslstl/bslstl_deque.3.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"))) + ;; https://bloomberg.github.io/bde-tools/bbs/reference/bbs_build_configuration.html#ufid + #:configure-flags '("-DUFID=opt_dbg_exc_mt_64_shr_cpp20") #:phases (modify-phases %standard-phases ;; Explicitly build tests separate from the main build. @@ -2089,6 +2091,8 @@ (define-public bloomberg-bde concepts (like dates and times), and building blocks for developing 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)))) (define-public gulrak-filesystem diff --git a/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch b/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch index b08ca5eac0..7743863cf8 100644 --- a/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch +++ b/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch @@ -4,13 +4,11 @@ locating the bloomberg-bde-tools CMake modules. --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,8 +1,6 @@ - cmake_minimum_required(VERSION 3.15) +@@ -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/") --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) + include(bde_workspace)