From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YFXqLYw/kGZnRAAA62LTzQ:P1 (envelope-from ) for ; Thu, 11 Jul 2024 20:24:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id YFXqLYw/kGZnRAAA62LTzQ (envelope-from ) for ; Thu, 11 Jul 2024 22:24:44 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=lMEKV8NS; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="Macs/GYH"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720729484; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=4s4fDUF6F/Csmf6FtGj/SMmeQn2mcwPRV0frXo3iSdU=; b=q5VRayElB4KF//b0Wi5cstjO+1nV8SGnQwf3DGdrhyoq99QzvveauuCi6vF5M0tjBtR0Dv +CZ9ndLHPzN+KOuh3B+Cqt6qjzycPZzHG+n8RNIBRtfrRdgJPWrJjrxzY+f6VsQFuyXmlg xaev/phQE7/NYiuS1XCPy+s4+kjh+kNzuunoS7EPj8ZWzXwUWqIEQPbH7OecoUXLCUVYr3 Ga9xkG4r4NR3v4yb88SKaiCs4uBGvbRK+Ut1SfusQ7/d91UXSn+8trPXBicOL7eAZ9tG2U W7HiQrxAM2iQjCCQyNMWXrwLVnqfWN6969/sNP135m5rquFG4zGQxLuBPOkWKw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=lMEKV8NS; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="Macs/GYH"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720729484; a=rsa-sha256; cv=none; b=t4xAjIQ2D+sQ782euMqGvR5uESVCQ1nH+3FuvR/rsEZe+XLgtNCOEVkd5RANzbrThTsRy2 cX9wW7hgh3KW/AKpDzeIFIRG7OrqmcO2B4WA0v/U5fMTGOif7OfLLUYwleYUyH0Tx9oYG8 dK0r6MtM/MvvCpL56YpHwW60DwdD9yNkP3VqPJKeyq3U3x10fT1E+M8H0pg6U5iT4DOlyf oLgeXoIqw2t/csWKYWrwITptZlAElprIdEWXQlwNuhb2s/8w6FC7WE1c4joypIaOIyKw47 inW5qJmfvY1qg0K+eORFuu9mlOEXlNZyZrP1ToEy/pAbD2zohMiFAkzqgVcTIg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1E03D14717 for ; Thu, 11 Jul 2024 22:24:44 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS0Kl-0004m6-SV; Thu, 11 Jul 2024 16:24:07 -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 1sS0Kk-0004lK-81 for bug-guix@gnu.org; Thu, 11 Jul 2024 16:24:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sS0Kg-0005A1-QE for bug-guix@gnu.org; Thu, 11 Jul 2024 16:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS0Kg-0002HL-JI for bug-guix@gnu.org; Thu, 11 Jul 2024 16:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#72040: [core-updates] Boost bug / breaks libreoffice [was libetonyek link failure] Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 11 Jul 2024 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72040 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 72040@debbugs.gnu.org Received: via spool by 72040-submit@debbugs.gnu.org id=B72040.17207294008708 (code B ref 72040); Thu, 11 Jul 2024 20:24:02 +0000 Received: (at 72040) by debbugs.gnu.org; 11 Jul 2024 20:23:20 +0000 Received: from localhost ([127.0.0.1]:52639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS0Jz-0002GN-Oj for submit@debbugs.gnu.org; Thu, 11 Jul 2024 16:23:20 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:43375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS0Jx-0002GB-Ks for 72040@debbugs.gnu.org; Thu, 11 Jul 2024 16:23:18 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 43E201140CC6; Thu, 11 Jul 2024 16:23:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 11 Jul 2024 16:23:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=mesmtp; t=1720729391; x=1720815791; bh=4s4fDUF 6F/Csmf6FtGj/SMmeQn2mcwPRV0frXo3iSdU=; b=lMEKV8NSjVmy9MOjjjhHY0J a3HjRceua7BUTytDR4OXW338PScZJtNAlHPfRHg+AkXIWh5yKjnj4pHnAT42LJ25 RPkIIB50fwc2vTWp74RW7t1+sV3Bvch1KXRSCLbPuhxASti3wwfTVnhrgktapeZk VMU1sj+9msAouj+A7d8M= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1720729391; x=1720815791; bh=4s4fDUF6F/Csmf6FtGj/SMmeQn2m cwPRV0frXo3iSdU=; b=Macs/GYHdKWyUJssYt+1aBFMpKKb3mgtPLZ1d7Ako7I5 yVv9bdpJx23aloKY/iCFsnX/kBwaRp+UYsak+fR5SKvh/sJ68/FnBF5sx0iKcUPt tyL4gI6k8aN7OhACWzRt19e6K3ucinr/f3cqaissxn2Kl3HqJzPWxZ5MXXow272a qScMb80hGggsxHUuCy1MklkTBIojDBBRV0nQtm2ayh4ds60uiKVX4PWiiZJfr87i zmhctKxScJEN/Faj8cz2eHvU/M4lDwzu/gocH6JGA86wQK/w/KmGwITiwM2WWRSF /Y/iEMzri6z2BFJlF/JpC8e1mxCAfhktD0Rh3Z/lPg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrfeeggddugeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesghdtre ertddtvdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhepudekveegteekleetgfeitdejgfejke ffudethedvhfeukeduleeikeejfeehffetnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <72040@debbugs.gnu.org>; Thu, 11 Jul 2024 16:23:10 -0400 (EDT) Date: Thu, 11 Jul 2024 16:23:09 -0400 From: Leo Famulari Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="lcn/JRp3DhidjRdU" Content-Disposition: inline In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 1E03D14717 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -7.60 X-Spam-Score: -7.60 X-TUID: 37JJWICmurUc --lcn/JRp3DhidjRdU Content-Type: multipart/mixed; boundary="nSKrKCluuCZWe0Kc" Content-Disposition: inline --nSKrKCluuCZWe0Kc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Jul 11, 2024 at 03:15:27PM -0400, Leo Famulari wrote: > I'm testing a patch for Boost now. It will cause a huge number of > rebuilds, so it would be great to come up with another approach. Here's a patch that patches Boost, while also creating a hidden package boost-for-source-highlight. This variant is only used by the source-highlight package, which is used by gdb, and thus rust. So, it aims to avoid rebuilding everything rust. I'm testing it now. Any thoughts? --nSKrKCluuCZWe0Kc Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-WIP-Boost-Fix-a-bug-that-breaks-libetonyek.patch" Content-Transfer-Encoding: quoted-printable =46rom 405919330bbb26a8f9eee3d801376c5925882e28 Mon Sep 17 00:00:00 2001 Message-ID: <405919330bbb26a8f9eee3d801376c5925882e28.1720729374.git.leo@fa= mulari.name> =46rom: Leo Famulari Date: Thu, 11 Jul 2024 15:18:51 -0400 Subject: [PATCH] WIP: Boost: Fix a bug that breaks libetonyek. This fixes * gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/boost.scm (boost)[source]: Use it. (boost-for-source-highlight): New variable, not using the patch. * gnu/packages/pretty-print.scm (source-highlight)[inputs]: Replace BOOST w= ith BOOST-FOR-SOURCE-HIGHLIGHT. Change-Id: I5fbc9eb5000aefd7d3a14cc7a0482741032b5400 --- gnu/local.mk | 1 + gnu/packages/boost.scm | 26 +++++++++++-- .../boost-fix-duplicate-definitions-bug.patch | 38 +++++++++++++++++++ gnu/packages/pretty-print.scm | 2 +- 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/boost-fix-duplicate-definitions-bu= g.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8a9c89225b..f722acfb8a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1016,6 +1016,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/bloomberg-bde-cmake-module-path.patch \ %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \ %D%/packages/patches/boolector-find-googletest.patch \ + %D%/packages/patches/boost-fix-duplicate-definitions-bug.patch \ %D%/packages/patches/breezy-fix-gio.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 70774617f0..2fdea80896 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -74,9 +74,11 @@ (define-public boost version "/source/boost_" (version-with-underscores version) ".tar= =2Ebz2")) (patches - (list (boost-patch - "0001-unordered-fix-copy-assign.patch" version - "09j61m5xh7099k5na9i43x5rra51znf7vm2nyh89yqpizcll9q6= 6"))) + (append + (search-patches "boost-fix-duplicate-definitions-bug.patc= h") + (list (boost-patch + "0001-unordered-fix-copy-assign.patch" version + "09j61m5xh7099k5na9i43x5rra51znf7vm2nyh89yqpizcll9= q66")))) (patch-flags '("-p2")) (sha256 (base32 @@ -204,6 +206,24 @@ (define-public boost (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" "Some components have other similar licenc= es.")))) =20 +(define-public boost-for-source-highlight + (hidden-package (package (inherit boost) + (name "boost") + (version "1.83.0") + (source (origin + (method url-fetch) + (uri (string-append "https://boostorg.jfrog.io/artifactory/m= ain/release/" + version "/source/boost_" + (version-with-underscores version) ".tar= =2Ebz2")) + (patches + (list (boost-patch + "0001-unordered-fix-copy-assign.patch" version + "09j61m5xh7099k5na9i43x5rra51znf7vm2nyh89yqpizcll9= q66"))) + (patch-flags '("-p2")) + (sha256 + (base32 + "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34"))))= ))) + ;; Sadly, this is needed for irods. It won't link with 1.69 or later. (define-public boost-for-irods (package diff --git a/gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch= b/gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch new file mode 100644 index 0000000000..f2e3decedb --- /dev/null +++ b/gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch @@ -0,0 +1,38 @@ +Fix the build of libetonyek / libreoffice: + +https://issues.guix.gnu.org/72040 + +Patch copied from upstream source repository: + +https://github.com/boostorg/phoenix/commit/8913607a3788cb82d48ed461ea59c91= 9b7bad3df + +From 8913607a3788cb82d48ed461ea59c919b7bad3df Mon Sep 17 00:00:00 2001 +From: djowel +Date: Tue, 29 Aug 2023 14:32:41 +0800 +Subject: [PATCH] Disabled this for now, due to ODR violations $$$ Fix Me $= $$ + +--- + include/boost/phoenix/stl/tuple.hpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/boost/phoenix/stl/tuple.hpp b/include/boost/phoenix/s= tl/tuple.hpp +index fb9440d2..a2e42bec 100644 +--- a/include/boost/phoenix/stl/tuple.hpp ++++ b/include/boost/phoenix/stl/tuple.hpp +@@ -106,6 +106,7 @@ namespace boost { namespace phoenix { + tuple_detail::idx_wrap(), t); + } +=20 ++#if 0 // Disabled this for now due to ODR viaolations $$$ Fix Me $$$ + // Make unpacked argument placeholders + namespace placeholders { + #define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT) +@@ -114,6 +115,8 @@ namespace boost { namespace phoenix { + boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg= 1); + #include BOOST_PP_LOCAL_ITERATE() + } ++#endif ++ + }} // namespace boost::phoenix +=20 + #endif // C++ 14 diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 220761fc07..d8ff1664b4 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -305,7 +305,7 @@ (define-public source-highlight ;; The ctags that comes with emacs does not support the --excmd option= s, ;; so can't be used (inputs - (list boost)) + (list boost-for-source-highlight)) (native-inputs (list bison flex)) (arguments base-commit: 50243774824597dbd141a074a7be0117dc450cef --=20 2.45.2 --nSKrKCluuCZWe0Kc-- --lcn/JRp3DhidjRdU Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEaEByLu7k06ZO5T6saqwZY3V/R/8FAmaQPyUACgkQaqwZY3V/ R/+NOhAApU8xGgGA1SXw+mBc2bf1+A0SQ89hUMDj+w5M1EKkBUeZ+U6TvHlMzxvt Sw72knzxBmCJDks+lFKaiZodhjpQuPowiDZ+q4uYIyIs7EFIqVj1j0tFzdQ0ffV8 qVx87JIZowoVg4LMhMYerYUnTfpBqC/DqvOmmILdFlgFxn3L9wbhvMjP07bEZKO1 t5JYGVf8t0n61EClyarc32lPTB1UwPqERkD7OU8lqWaG5EYtM7a5iSF5zjlZ3I9k KgEUzdb3ZjbMjDOM6sXUUPQe1iULRtyyZ9dy9tg2ufezrKL52xwl84euGerXGCiI WPLxocCOh51/tPojl9XBpGPU5/CISi5wlskUXa+2Bz7dCwqY1GF+SsZoKVRUyAvm uMzVRJOcKV4LirYIM4E/tEMdxtIxc/C0I+Tjmgs3Hd2pV9aBKWk+BpRHNUxR4UOc uFlz8lDaFJ89pYGI3B98Aq7KJPUTTFCJ2stoALBBNxbAlHnIZfHsOPld5d4Cxe35 FbPSCSvngk6NXjuCFEmfJUW+PTPcWKuB94J6SdQtYNUmKyyC1zbFFtbHsyRickcF 3Fk+2RS77AnGY2wBHUDZPJNgHIWCzeLuGmH2oF0ikYXcJVSwHisSg3OWOlnEwyuq 3fzZ2T074PFIjXoO30J4pwpyv0hm1HEAUgi+L1tpElaZkH0kWvg= =NvPy -----END PGP SIGNATURE----- --lcn/JRp3DhidjRdU--