From patchwork Thu May 20 18:59:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 29433 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 ED87227BC81; Thu, 20 May 2021 20:01:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F66F27BC78 for ; Thu, 20 May 2021 20:01:34 +0100 (BST) Received: from localhost ([::1]:53640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljnvJ-0003oV-Gv for patchwork@mira.cbaines.net; Thu, 20 May 2021 15:01:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljnuo-0003mQ-Q9 for guix-patches@gnu.org; Thu, 20 May 2021 15:01:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51909) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljnuo-00047c-3J for guix-patches@gnu.org; Thu, 20 May 2021 15:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ljnuo-0000eK-2V for guix-patches@gnu.org; Thu, 20 May 2021 15:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48546] [PATCH] [core-updates] gnu: boost: Update to 1.76.0. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 May 2021 19:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48546 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48546@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16215372562475 (code B ref -1); Thu, 20 May 2021 19:01:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 May 2021 19:00:56 +0000 Received: from localhost ([127.0.0.1]:35222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljnuh-0000dq-Ac for submit@debbugs.gnu.org; Thu, 20 May 2021 15:00:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:55074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljnue-0000di-Tq for submit@debbugs.gnu.org; Thu, 20 May 2021 15:00:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljnud-0003f6-9M for guix-patches@gnu.org; Thu, 20 May 2021 15:00:52 -0400 Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]:35805) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljnuZ-0003yh-Jo for guix-patches@gnu.org; Thu, 20 May 2021 15:00:51 -0400 Received: by mail-io1-xd30.google.com with SMTP id s7so1608237iov.2 for ; Thu, 20 May 2021 12:00:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=4eRnr2tYSdhD9Fq6wEBKM2IYFDgs8FtRKMCltACUwtI=; b=ejjx91oMfym4hLQa3r0rL09BYvwlgG4J4wF4e4u3+skO8hlYe7/HF5osunR9C2/0t+ lls37D3JY1QPTMyNfKIhEoy+ec7TMegHOiXVeN5sG0qYsBc74HFOBzNtqnEfQzFvysEh a9zwNdUfdNxTTd4Tqpxfj2hkeoBtDmxx0KFL+jff3JWkiVCeerErA5TBlarxfcQ6dZXA DGOB0OAGbKX76ypJz2b2/C4mBmMzTXOF5MsePjv+/1bzAJnLgszok2ndGWIQGt6zyTgA A9IhnbwFUhhXWsbN4W2nD8hMPsvefX0tnKbbDW4ZPTcKLixgR9FjelSE3cqhovAQ/E7t XyFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=4eRnr2tYSdhD9Fq6wEBKM2IYFDgs8FtRKMCltACUwtI=; b=OzeQD5V7to8siOy6PXXtSgN7FXSO1kr/un+DDCzqEWOUr6ZjvI0NgbGeGIbizPGeMP ysOzEAz5aOzxfT/s+KFhJqai2z5UFZxLcpnxfhIpsR0GTzUF3zo85Kjv8o0j8mnL8Imw nwT7yCoPHbptVhT8QMFC17zLwGktxqXZanyHyHkL8pUJfaHt532P/eZzvgxJ3DzIDfxZ /7T0iyaeS1+0Upsp3dcOp4Z4wiyA+FH4VIYklRbCaQmXkHENR9OpyXOVQwtXIpfwzqYQ okjfhMTwrktR7UT2cCujnUDr9fyrf5PMveJ4XGKAnREILRArvX3hCSFRkANFlG2AWvu7 XxKg== X-Gm-Message-State: AOAM530XuT4IZWsz0uLC0yawKaisnP+ei7PIQPY/LAH2PghUVjq2NrXC H289kjD1ETCmOW/eBqppg+o9LAOYSr3tXe4zF46r3fwqCsblFofK X-Google-Smtp-Source: ABdhPJxEcS6eYkSKClfvwDT+AzpHhd0sp/uUJ+tYLocrsxTFFOPd7eXuPrDxgGEbMp9/zW8g16ZniwauwYFIyuIxDtk= X-Received: by 2002:a05:6638:2a1:: with SMTP id d1mr8149330jaq.52.1621537244862; Thu, 20 May 2021 12:00:44 -0700 (PDT) MIME-Version: 1.0 From: Greg Hogan Date: Thu, 20 May 2021 14:59:16 -0400 Message-ID: Received-SPF: none client-ip=2607:f8b0:4864:20::d30; envelope-from=code@greghogan.com; helo=mail-io1-xd30.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 From 9cd911d33aa6a13b2c04f9bc0a9568fe0e19031a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 29 Apr 2021 10:45:49 +0000 Subject: [PATCH] gnu: boost: Update to 1.76.0. * gnu/packages/boost.scm (boost): Update to 1.76.0. [source]: Remove upstreamed patch. * gnu/packages/patches/boost-fix-static-linking.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/boost.scm | 6 ++---- .../patches/boost-fix-transitive-linking.patch | 16 ---------------- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/boost-fix-transitive-linking.patch - print.text - From 9cd911d33aa6a13b2c04f9bc0a9568fe0e19031a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 29 Apr 2021 10:45:49 +0000 Subject: [PATCH] gnu: boost: Update to 1.76.0. * gnu/packages/boost.scm (boost): Update to 1.76.0. [source]: Remove upstreamed patch. * gnu/packages/patches/boost-fix-static-linking.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/boost.scm | 6 ++---- .../patches/boost-fix-transitive-linking.patch | 16 ---------------- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/boost-fix-transitive-linking.patch diff --git a/gnu/local.mk b/gnu/local.mk index add01cf6d2..4c7ce2815f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -878,7 +878,6 @@ dist_patch_DATA = \ %D%/packages/patches/blender-2.79-oiio2.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ %D%/packages/patches/blender-2.79-python-3.8-fix.patch \ - %D%/packages/patches/boost-fix-transitive-linking.patch \ %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/cairo-CVE-2018-19876.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index c6cf452f09..e9da56e115 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -66,17 +66,15 @@ (define-public boost (package (name "boost") - (version "1.75.0") + (version "1.76.0") (source (origin (method url-fetch) (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/" version "/source/boost_" (version-with-underscores version) ".tar.bz2")) - ; Should be included in next Boost update - (patches (search-patches "boost-fix-transitive-linking.patch")) (sha256 (base32 - "1js9zpij58l60kx46s3lxdp5207igppjnhqigwhbpdvd04gb6gcm")))) + "0hcc661savk32hx65997p0ss1awj6ala4cmz4w7lbi42x6k7nfgh")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) ("zlib" ,zlib))) diff --git a/gnu/packages/patches/boost-fix-transitive-linking.patch b/gnu/packages/patches/boost-fix-transitive-linking.patch deleted file mode 100644 index a42feab109..0000000000 --- a/gnu/packages/patches/boost-fix-transitive-linking.patch +++ /dev/null @@ -1,16 +0,0 @@ -Patch from https://github.com/boostorg/boost_install/issues/47 -which should be included in the Boost 1.76 release. - -This patch prevents CMake from explicitly linking against Boost dependencies -when building against the shared Boost libraries. ---- a/tools/boost_install/boost-install.jam -+++ b/tools/boost_install/boost-install.jam -@@ -483,7 +483,7 @@ rule generate-cmake-variant- ( target : sources * : properties * ) - - .info " deps3=" $(deps3) ; - -- if $(deps3) -+ if $(deps3) && $(link) = static - { - print.text - -- 2.31.1