From: "Ludovic Courtès" <ludo@gnu.org>
To: 'Brendan Tildesley <mail@brendan.scot>
Cc: Maxime Devos <maximedevos@telenet.be>, 54337@debbugs.gnu.org
Subject: [bug#54337] [PATCH v2 2/3] gnu: Add boost-for-cryfs.
Date: Tue, 15 Mar 2022 09:14:01 +0100 [thread overview]
Message-ID: <87sfrjocom.fsf@gnu.org> (raw)
In-Reply-To: <20220314093550.16580-2-mail@brendan.scot> (Brendan Tildesley's message of "Mon, 14 Mar 2022 20:35:49 +1100")
Hi,
'Brendan Tildesley <mail@brendan.scot> skribis:
> From: Brendan Tildesley <mail@brendan.scot>
>
> * gnu/packages/boost.scm (boost-for-cryfs): New variable. Since
> updating boost would resulting in building 1000s of rebuilds, add a
> temporary variant to fixing a missing import resulting in "error:
> 'transform' is not a member of 'std'" when building cryfs. See:
> https://github.com/boostorg/process/commit/e08374ed95ac33865bda40602c94909e7cd9607f
>
> * gnu/packages/patches/boost-wchar-include-algorithm.patch: New
> file.
> * gnu/local.mk: Reference patch.
[...]
> +(define-public boost-for-cryfs
> + ;; This patch applies for boost 1.77. Should not be needed in later releases.
> + ;; See: https://github.com/boostorg/process/commit/e08374ed95ac33865bda40602c94909e7cd9607f
> + (package/inherit boost
> + (name "boost-for-cryfs")
> + (source (origin
> + (inherit (package-source boost))
> + (patches (search-patches "boost-wchar-include-algorithm.patch"))))))
> +
> ;; 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-wchar-include-algorithm.patch b/gnu/packages/patches/boost-wchar-include-algorithm.patch
> new file mode 100644
> index 0000000000..c174dc5cd2
> --- /dev/null
> +++ b/gnu/packages/patches/boost-wchar-include-algorithm.patch
> @@ -0,0 +1,11 @@
> +--- a/boost/process/detail/traits/wchar_t.hpp
> ++++ b/boost/process/detail/traits/wchar_t.hpp
> +@@ -12,6 +12,8 @@
> + #include <boost/process/detail/traits/env.hpp>
> + #include <boost/process/locale.hpp>
> +
> ++#include <algorithm>
‘guix lint’ must complain that this patch lacks a comment at the top.
:-)
Since this affect only cryfs, and since it’s just a missing include, I
wonder if we could instead add “#include <algorithm>” in the cryfs
source file(s) that include(s) Boost headers? That way, we wouldn’t
need an extra Boost build.
Thoughts?
Ludo’.
next prev parent reply other threads:[~2022-03-15 14:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 6:16 [bug#54337] [PATCHES 0/2] gnu: cryfs: Update to 0.11.2 Brendan Tildesley
2022-03-11 6:19 ` [bug#54337] [PATCH 1/2] gnu: Add boost-1.77/fixed Brendan Tildesley
2022-03-11 6:19 ` [bug#54337] [PATCH 2/2] gnu: cryfs: Update to 0.11.2 Brendan Tildesley
2022-03-11 22:03 ` [bug#54337] [PATCH 1/2] gnu: Add boost-1.77/fixed Maxime Devos
2022-03-14 9:35 ` [bug#54337] [PATCH v2 1/3] gnu: crypto++: Update to 8.6.0 'Brendan Tildesley
2022-03-14 9:35 ` [bug#54337] [PATCH v2 2/3] gnu: Add boost-for-cryfs 'Brendan Tildesley
2022-03-15 8:14 ` Ludovic Courtès [this message]
2022-03-15 13:07 ` Brendan Tildesley
2022-03-15 16:35 ` Maxime Devos
2022-03-16 3:03 ` [bug#54337] [PATCH v3] gnu: Update crfys to 0.11.2 Brendan Tildesley
2022-03-16 10:40 ` Ludovic Courtès
2022-03-14 9:35 ` [bug#54337] [PATCH v2 3/3] gnu: cryfs: Update " 'Brendan Tildesley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sfrjocom.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=54337@debbugs.gnu.org \
--cc=mail@brendan.scot \
--cc=maximedevos@telenet.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.