diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
commit | 8de4131b2ddd11faa3394cf497484563068c9e7a (patch) | |
tree | ed4ed9e586c7236f09c109afdd416dac18ba8cc3 /gnu/packages/patches/doxygen-hurd.patch | |
parent | 15406013fe63f2ab238eec2d7a8adbc586806ac8 (diff) | |
parent | 45b7a8bfda5bde2e2daee4bec0ca092cd719d726 (diff) | |
download | guix-8de4131b2ddd11faa3394cf497484563068c9e7a.tar.gz guix-8de4131b2ddd11faa3394cf497484563068c9e7a.zip |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/patches/doxygen-hurd.patch')
-rw-r--r-- | gnu/packages/patches/doxygen-hurd.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/gnu/packages/patches/doxygen-hurd.patch b/gnu/packages/patches/doxygen-hurd.patch new file mode 100644 index 0000000000..a40923184b --- /dev/null +++ b/gnu/packages/patches/doxygen-hurd.patch @@ -0,0 +1,30 @@ +Upstream status: Adapted from upstream. + +From d3d968e5835f449d7ea715f45160db81ea906303 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Tue, 16 Aug 2022 20:29:54 +0200 +Subject: [PATCH] Fix build on GNU/Hurd + +There is no path length limitation there, even via pathconf. But glibc +provides a getcwd function that allocates the buffer dynamically so we can +just leverage that. +--- + include/ghc/filesystem.hpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/filesystem/filesystem.hpp.orig 2022-08-11 22:14:32.000000000 +0200 ++++ b/filesystem/filesystem.hpp 2023-06-13 07:26:25.310000000 +0200 +@@ -4081,6 +4081,13 @@ + return path(); + } + return path(std::wstring(buffer.get()), path::native_format); ++#elif defined(__GLIBC__) ++ std::unique_ptr<char, decltype(&std::free)> buffer { ::getcwd(NULL, 0), std::free }; ++ if (buffer == nullptr) { ++ ec = detail::make_system_error(); ++ return path(); ++ } ++ return path(buffer.get()); + #else + size_t pathlen = static_cast<size_t>(std::max(int(::pathconf(".", _PC_PATH_MAX)), int(PATH_MAX))); + std::unique_ptr<char[]> buffer(new char[pathlen + 1]); |