From patchwork Tue Jan 26 21:57:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 26657 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 58D8727BC1C; Tue, 26 Jan 2021 21:58:10 +0000 (GMT) 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=ham 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 7343127BC1B for ; Tue, 26 Jan 2021 21:58:09 +0000 (GMT) Received: from localhost ([::1]:46594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4WLg-0006KW-L8 for patchwork@mira.cbaines.net; Tue, 26 Jan 2021 16:58:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4WLa-0006KN-Cy for guix-patches@gnu.org; Tue, 26 Jan 2021 16:58:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4WLa-0002jz-54 for guix-patches@gnu.org; Tue, 26 Jan 2021 16:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4WLa-0006Ir-4H for guix-patches@gnu.org; Tue, 26 Jan 2021 16:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45727] [PATCH] gnu: folly: Update to 2021.01.04.00. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Jan 2021 21:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45727 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 45727-submit@debbugs.gnu.org id=B45727.161169825824199 (code B ref 45727); Tue, 26 Jan 2021 21:58:02 +0000 Received: (at 45727) by debbugs.gnu.org; 26 Jan 2021 21:57:38 +0000 Received: from localhost ([127.0.0.1]:42846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4WL6-0006I9-NW for submit@debbugs.gnu.org; Tue, 26 Jan 2021 16:57:38 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:36153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4WL4-0006Hu-UC for 45727@debbugs.gnu.org; Tue, 26 Jan 2021 16:57:31 -0500 Received: by mail-wr1-f42.google.com with SMTP id 6so18081656wri.3 for <45727@debbugs.gnu.org>; Tue, 26 Jan 2021 13:57:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=swaCpRFhAIhxMip2S3B+VqNkxjLvC2o2dWheELY9v68=; b=RJu8Y5wSyg8GSRP/M3GmXrlgsn4K/m0akPaqFaHyj2qgbp/peb8IvoUpIy9ZvuaEyn Smqg9173JM3Wx6DEmDWurAwnf1Gpt4/kNO2rDlt7tf/zGMmd0FvLc0CggSsHmQjbVaox 3/rY79IvQ6z+gsv6tPUH1ZoQLeDxHltX3DF+dBYvook8OENWqu5Fqy5hSNPEkebULEoK IPOgU7AB39dJqVpN+SZd61L0/e0unuPnHKABltuuZqBde4a7SUb/UgiQGQQNj2ziRDhr DONVfh2beBsGb2c7oQjc9MD3os32NG3zcep0uwUxG1xF2cv6Jcd4Y1aH0vNmXSx38cCO 8hvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=swaCpRFhAIhxMip2S3B+VqNkxjLvC2o2dWheELY9v68=; b=b4Z2GKjppoNnDEoUDU6aVAjXwbdhcDljv9sRMlmYI1sMXJuHWMyZ6jlFGt+Sjup7CQ iRcj9UqRG9GxA0I/cJl6rm2gSGR9hIZrp2WprncpaX5WIWOH3/CQPlRzO8NKfeLwFUMI Pv8+ZIhUQUqhM+MULdI64CvpraMn/1Fq4a4gbsQBFfJ00W2IWrpE6aQIcR6oQW5LO9jS 3ICdz/2u8l3tG71QUmqsuCwox1uP/V572GN48n9vguF5hRWYc7DmLYpF2VUfVDT+Kyy8 n8DfaoOIApkYCszR+FXsCflO/r95eAwjUBNC91/QybGhM05aAkIoNpUIJsqGxV8I7UGF 6SfA== X-Gm-Message-State: AOAM532lkj8iVFEEFQZC3iTPAgD5nq+Yotv4sLSj4xUVWTZND0GWyUSd aB6siHVVGGGumuKl+PtDXyR0zIBP8EC37HkTeieQXSat3oSTHW8dO4I= X-Google-Smtp-Source: ABdhPJx/xt4/oA2VbaknUpAJk3k9uSqQ7YrugKm4gu+BTeA4CxgTOkSHp49bExB7cY/8WLaxUJ7oQZtCslrVwlMzv+Y= X-Received: by 2002:adf:f687:: with SMTP id v7mr8091449wrp.182.1611698245217; Tue, 26 Jan 2021 13:57:25 -0800 (PST) MIME-Version: 1.0 References: <87a6t5ht12.fsf@gnu.org> In-Reply-To: <87a6t5ht12.fsf@gnu.org> From: Greg Hogan Date: Tue, 26 Jan 2021 16:57:13 -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: , Cc: 45727@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches For core-updates. From 03030191d82469532048f7a900291713e8208106 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 25 Jan 2021 17:35:27 +0000 Subject: [PATCH] gnu: boost: Patch transitive linking bug. * gnu/packages/patches/boost-fix-transitive-linking.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/boost.scm (boost)[source]: Use it. --- gnu/local.mk | 2 ++ gnu/packages/boost.scm | 3 +++ .../patches/boost-fix-transitive-linking.patch | 16 ++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/boost-fix-transitive-linking.patch + print.text + diff --git a/gnu/local.mk b/gnu/local.mk index f84f859bdf..0e8e9c37b9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -40,6 +40,7 @@ # Copyright © 2020 Malte Frank Gerdes # Copyright © 2020 Vinicius Monego # Copyright © 2021 Björn Höfling +# Copyright © 2021 Greg Hogan # # This file is part of GNU Guix. # @@ -866,6 +867,7 @@ 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/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 1db173bd16..bc0e95b1ba 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,6 +69,8 @@ (uri (string-append "https://dl.bintray.com/boostorg/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")))) diff --git a/gnu/packages/patches/boost-fix-transitive-linking.patch b/gnu/packages/patches/boost-fix-transitive-linking.patch new file mode 100644 index 0000000000..a42feab109 --- /dev/null +++ b/gnu/packages/patches/boost-fix-transitive-linking.patch @@ -0,0 +1,16 @@ +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 + {