mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 03:55:08 -06:00
88ce778dbf
* gnu/packages/patches/cryfs-boost-1.88-fix.patch: New file. * gnu/packages/patches/cryfs-boost-1.89-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/crypto.scm (cryfs): Update to 1.0.1. [origin]: Add patches. [arguments]<#:configure-flags>: Update. <#:phases>: Update ’check and ’fix-up. [inputs]: Remove boost-1.83; add boost. [native-inputs]: Add googletest. [properties]: Enable tuning. Closes guix/guix#4539 Change-Id: I61ea925359edd1181424295380d53bf2482c7c62 Modified-by: Cayetano Santos <csantosb@inventati.org> Signed-off-by: Cayetano Santos <csantosb@inventati.org>
32 lines
1,022 B
Diff
32 lines
1,022 B
Diff
From 91e2c9b8fd5f7a1b0e57ad1310534606ce70c338 Mon Sep 17 00:00:00 2001
|
|
From: Michael Cho <michael@michaelcho.dev>
|
|
Date: Sun, 13 Apr 2025 10:37:29 -0400
|
|
Subject: [PATCH] Fix building with Boost 1.88
|
|
|
|
---
|
|
src/cpp-utils/process/subprocess.cpp | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/src/cpp-utils/process/subprocess.cpp b/src/cpp-utils/process/subprocess.cpp
|
|
index 479bfe876..396ae09ec 100644
|
|
--- a/src/cpp-utils/process/subprocess.cpp
|
|
+++ b/src/cpp-utils/process/subprocess.cpp
|
|
@@ -1,7 +1,18 @@
|
|
#include "subprocess.h"
|
|
#include <array>
|
|
#include <boost/asio.hpp>
|
|
+#include <boost/version.hpp>
|
|
+#if BOOST_VERSION < 108800
|
|
#include <boost/process.hpp>
|
|
+#else
|
|
+#define BOOST_PROCESS_VERSION 1
|
|
+#include <boost/process/v1/args.hpp>
|
|
+#include <boost/process/v1/async_pipe.hpp>
|
|
+#include <boost/process/v1/child.hpp>
|
|
+#include <boost/process/v1/exe.hpp>
|
|
+#include <boost/process/v1/io.hpp>
|
|
+#include <boost/process/v1/search_path.hpp>
|
|
+#endif
|
|
#include <cerrno>
|
|
#include <cstddef>
|
|
#include <cstdio>
|