GNU bug report logs - #45727
[PATCH] gnu: folly: Update to 2021.01.04.00.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 45727 in the body.
You can then email your comments to 45727 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: folly: Update to 2021.01.04.00.
Date: Fri, 8 Jan 2021 07:19:34 -0500

[Message part 1 (text/plain, inline)]

I went to build folly against core-updates and the link failed due to
missing dependencies on libicu*. This patch also updates the folly version.


From e710c98a2f5beef9d8640bf3618ae20bd12c12f7 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code <at> greghogan.com>
Date: Thu, 7 Jan 2021 21:54:37 +0000
Subject: [PATCH] gnu: folly: Update to 2021.01.04.00.

* gnu/packages/cpp.scm (folly): Update to 2021.01.04.00.
[propagated-inputs]: Add icu4c.
---
 gnu/packages/cpp.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 00e006928e..5032a5c58b 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2020 Marius Bakke <marius <at> gnu.org>
 ;;; Copyright © 2020 Michael Rohleder <mike <at> rohleder.de>
 ;;; Copyright © 2020 Alexandros Theodotou <alex <at> zrythm.org>
-;;; Copyright © 2020 Greg Hogan <code <at> greghogan.com>
+;;; Copyright © 2020, 2021 Greg Hogan <code <at> greghogan.com>
 ;;; Copyright © 2020 Brett Gilio <brettg <at> gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -50,6 +50,7 @@
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gcc)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages libunwind)
   #:use-module (gnu packages linux)
@@ -688,7 +689,7 @@ standard GNU style syntax for options.")
 (define-public folly
   (package
     (name "folly")
-    (version "2020.10.05.00")
+    (version "2021.01.04.00")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -697,7 +698,7 @@ standard GNU style syntax for options.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0q4w4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn"))))
+                "03r16q966p3qg4661ns6q5phmi67i536vi804ayja9fmd6hyfqdj"))))
     (build-system cmake-build-system)
     (arguments
      '(;; Tests must be explicitly enabled
@@ -708,6 +709,7 @@ standard GNU style syntax for options.")
      `(("boost" ,boost)
        ("gflags" ,gflags)
        ("glog" ,glog)
+       ("icu4c" ,icu4c)
        ("liburing" ,liburing)))
     (inputs
      `(("bzip2" ,bzip2)
-- 
2.29.2

[Message part 2 (text/html, inline)]

[0001-gnu-folly-Update-to-2021.01.04.00.patch (application/octet-stream, attachment)]

Message #8 received at 45727 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Greg Hogan <code <at> greghogan.com>
Cc: 45727 <at> debbugs.gnu.org
Subject: Re: bug#45727: [PATCH] gnu: folly: Update to 2021.01.04.00.
Date: Tue, 19 Jan 2021 15:59:21 +0100

Hi Greg,

Greg Hogan <code <at> greghogan.com> skribis:

> I went to build folly against core-updates and the link failed due to
> missing dependencies on libicu*. This patch also updates the folly version.
>
>
>>From e710c98a2f5beef9d8640bf3618ae20bd12c12f7 Mon Sep 17 00:00:00 2001
> From: Greg Hogan <code <at> greghogan.com>
> Date: Thu, 7 Jan 2021 21:54:37 +0000
> Subject: [PATCH] gnu: folly: Update to 2021.01.04.00.
>
> * gnu/packages/cpp.scm (folly): Update to 2021.01.04.00.
> [propagated-inputs]: Add icu4c.

If there’s a reason to propagate ICU4C, could you state it in a comment?
Otherwise, can we just move it to ‘inputs’?

Apart from that it LGTM, and it’s applicable to ‘master’.

Could you send an updated patch?

Thanks,
Ludo’.

Message #11 received at 45727 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 45727 <at> debbugs.gnu.org
Subject: Re: bug#45727: [PATCH] gnu: folly: Update to 2021.01.04.00.
Date: Tue, 26 Jan 2021 16:55:19 -0500

[Message part 1 (text/plain, inline)]

Turns out this was an issue with Boost 1.75 (which I had patched over from
core-updates, requiring the C++20 support). I feel like I might as well
post the simple Folly version bump here and the core-updates Boost patch in
the following reply. Not sure when core-updates will be merged or if Boost
1.76 will be out by then.

From 334fc83ae2a3d92ba7813150709532b252592817 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code <at> greghogan.com>
Date: Thu, 7 Jan 2021 21:54:37 +0000
Subject: [PATCH] gnu: folly: Update to 2021.01.25.00.

* gnu/packages/cpp.scm (folly): Update to 2021.01.25.00.
---
 gnu/packages/cpp.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ca8f7a9f80..73a3ceb2df 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2020 Marius Bakke <marius <at> gnu.org>
 ;;; Copyright © 2020 Michael Rohleder <mike <at> rohleder.de>
 ;;; Copyright © 2020 Alexandros Theodotou <alex <at> zrythm.org>
-;;; Copyright © 2020 Greg Hogan <code <at> greghogan.com>
+;;; Copyright © 2020, 2021 Greg Hogan <code <at> greghogan.com>
 ;;; Copyright © 2020 Brett Gilio <brettg <at> gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -689,7 +689,7 @@ standard GNU style syntax for options.")
 (define-public folly
   (package
     (name "folly")
-    (version "2020.10.05.00")
+    (version "2021.01.25.00")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -698,7 +698,7 @@ standard GNU style syntax for options.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0q4w4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn"))))
+                "14dl1g6vf7mc90mcync5h2lp14fwcx8n9h91pmiq6rfgv1fjjrwz"))))
     (build-system cmake-build-system)
     (arguments
      '(;; Tests must be explicitly enabled
-- 
2.30.0

On Tue, Jan 19, 2021 at 9:59 AM Ludovic Courtès <ludo <at> gnu.org> wrote:

> Hi Greg,
>
> Greg Hogan <code <at> greghogan.com> skribis:
>
> > I went to build folly against core-updates and the link failed due to
> > missing dependencies on libicu*. This patch also updates the folly
> version.
> >
> >
> >>From e710c98a2f5beef9d8640bf3618ae20bd12c12f7 Mon Sep 17 00:00:00 2001
> > From: Greg Hogan <code <at> greghogan.com>
> > Date: Thu, 7 Jan 2021 21:54:37 +0000
> > Subject: [PATCH] gnu: folly: Update to 2021.01.04.00.
> >
> > * gnu/packages/cpp.scm (folly): Update to 2021.01.04.00.
> > [propagated-inputs]: Add icu4c.
>
> If there’s a reason to propagate ICU4C, could you state it in a comment?
> Otherwise, can we just move it to ‘inputs’?
>
> Apart from that it LGTM, and it’s applicable to ‘master’.
>
> Could you send an updated patch?
>
> Thanks,
> Ludo’.
>

[Message part 2 (text/html, inline)]

[0001-gnu-folly-Update-to-2021.01.25.00.patch (application/octet-stream, attachment)]

Message #14 received at 45727 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 45727 <at> debbugs.gnu.org
Subject: Re: bug#45727: [PATCH] gnu: folly: Update to 2021.01.04.00.
Date: Tue, 26 Jan 2021 16:57:13 -0500

[Message part 1 (text/plain, inline)]

For core-updates.

From 03030191d82469532048f7a900291713e8208106 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code <at> greghogan.com>
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

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 <mate.f.gerdes <at> gmail.com>
 # Copyright © 2020 Vinicius Monego <monego <at> posteo.net>
 # Copyright © 2021 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
+# Copyright © 2021 Greg Hogan <code <at> greghogan.com>
 #
 # 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 <mbakke <at> fastmail.com>
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2021 Greg Hogan <code <at> greghogan.com>
 ;;;
 ;;; 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
+     {
+         print.text
+
-- 
2.30.0

On Tue, Jan 19, 2021 at 9:59 AM Ludovic Courtès <ludo <at> gnu.org> wrote:

> Hi Greg,
>
> Greg Hogan <code <at> greghogan.com> skribis:
>
> > I went to build folly against core-updates and the link failed due to
> > missing dependencies on libicu*. This patch also updates the folly
> version.
> >
> >
> >>From e710c98a2f5beef9d8640bf3618ae20bd12c12f7 Mon Sep 17 00:00:00 2001
> > From: Greg Hogan <code <at> greghogan.com>
> > Date: Thu, 7 Jan 2021 21:54:37 +0000
> > Subject: [PATCH] gnu: folly: Update to 2021.01.04.00.
> >
> > * gnu/packages/cpp.scm (folly): Update to 2021.01.04.00.
> > [propagated-inputs]: Add icu4c.
>
> If there’s a reason to propagate ICU4C, could you state it in a comment?
> Otherwise, can we just move it to ‘inputs’?
>
> Apart from that it LGTM, and it’s applicable to ‘master’.
>
> Could you send an updated patch?
>
> Thanks,
> Ludo’.
>

[Message part 2 (text/html, inline)]

[0001-gnu-boost-Patch-transitive-linking-bug.patch (application/octet-stream, attachment)]

Message #17 received at 45727 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Greg Hogan <code <at> greghogan.com>
Cc: 45727 <at> debbugs.gnu.org
Subject: Re: bug#45727: [PATCH] gnu: folly: Update to 2021.01.04.00.
Date: Tue, 26 Jan 2021 23:31:33 +0100

Hi,

Greg Hogan <code <at> greghogan.com> skribis:

> Turns out this was an issue with Boost 1.75 (which I had patched over from
> core-updates, requiring the C++20 support). I feel like I might as well
> post the simple Folly version bump here and the core-updates Boost patch in
> the following reply. Not sure when core-updates will be merged or if Boost
> 1.76 will be out by then.

Sounds good to me.

>>From 334fc83ae2a3d92ba7813150709532b252592817 Mon Sep 17 00:00:00 2001
> From: Greg Hogan <code <at> greghogan.com>
> Date: Thu, 7 Jan 2021 21:54:37 +0000
> Subject: [PATCH] gnu: folly: Update to 2021.01.25.00.
>
> * gnu/packages/cpp.scm (folly): Update to 2021.01.25.00.

Applied to ‘master’, thanks!

Message #22 received at 45727-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Greg Hogan <code <at> greghogan.com>
Cc: 45727-done <at> debbugs.gnu.org
Subject: Re: bug#45727: [PATCH] gnu: folly: Update to 2021.01.04.00.
Date: Tue, 26 Jan 2021 23:41:01 +0100

Greg Hogan <code <at> greghogan.com> skribis:

>>From 03030191d82469532048f7a900291713e8208106 Mon Sep 17 00:00:00 2001
> From: Greg Hogan <code <at> greghogan.com>
> 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.

Pushed to ‘core-updates’.  Thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.