[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
71/92: gnu: doxygen: Fix build for the Hurd.
From: |
guix-commits |
Subject: |
71/92: gnu: doxygen: Fix build for the Hurd. |
Date: |
Fri, 23 Jun 2023 12:45:45 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit c780b1bafaa3415b001604e9802964fc98d35e4e
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Jun 13 07:18:26 2023 +0200
gnu: doxygen: Fix build for the Hurd.
* gnu/packages/patches/doxygen-hurd.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/documentation.scm (doxygen)[arguments]: When building for the
Hurd, add new phase 'apply-patch' and use it.
---
gnu/local.mk | 1 +
gnu/packages/documentation.scm | 12 +++++++++++-
gnu/packages/patches/doxygen-hurd.patch | 30 ++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 80380eb9dd..2b063d9571 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1066,6 +1066,7 @@ dist_patch_DATA =
\
%D%/packages/patches/doc++-segfault-fix.patch \
%D%/packages/patches/dovecot-opensslv3.patch \
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
+ %D%/packages/patches/doxygen-hurd.patch \
%D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \
%D%/packages/patches/dstat-skip-devices-without-io.patch \
%D%/packages/patches/dune-common-skip-failing-tests.patch \
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index be64bc4f95..047a074c3d 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.counoyer@gmail.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -40,6 +41,7 @@
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix deprecation)
+ #:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
@@ -224,7 +226,15 @@ markup) can be customized and extended by the user.")
(let ((/bin/sh (search-input-file inputs "/bin/sh")))
(substitute* "src/portable.cpp"
(("/bin/sh")
- /bin/sh))))))))
+ /bin/sh)))))
+ #$@(if (target-hurd?)
+ #~((add-after 'unpack 'apply-patch
+ (lambda _
+ (let ((patch-file
+ #$(local-file
+ (search-patch "doxygen-hurd.patch"))))
+ (invoke "patch" "--force" "-p1" "-i" patch-file)))))
+ #~()))))
(synopsis "Generate documentation from annotated sources")
(description "Doxygen is the de facto standard tool for generating
documentation from annotated C++ sources, but it also supports other popular
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]);
- 74/92: gnu: glib: Disable tests for the Hurd., (continued)
- 74/92: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/06/23
- 24/92: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/23
- 45/92: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/06/23
- 48/92: gnu: python: Support native build on the Hurd., guix-commits, 2023/06/23
- 55/92: gnu: tcl: Remove failing tests on the Hurd.., guix-commits, 2023/06/23
- 58/92: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/06/23
- 59/92: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/06/23
- 60/92: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/06/23
- 64/92: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/06/23
- 69/92: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/06/23
- 71/92: gnu: doxygen: Fix build for the Hurd.,
guix-commits <=
- 70/92: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/06/23
- 73/92: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/06/23
- 78/92: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/06/23
- 79/92: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/06/23
- 80/92: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/06/23
- 81/92: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/23
- 82/92: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/06/23
- 83/92: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/06/23
- 84/92: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/06/23
- 85/92: self: Build gnu/packages/*.go in 26 steps on the Hurd., guix-commits, 2023/06/23