[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
28/31: gnu: screen: Build fix for the Hurd.
From: |
guix-commits |
Subject: |
28/31: gnu: screen: Build fix for the Hurd. |
Date: |
Tue, 24 Mar 2020 18:38:56 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 427742a33a80264a790c2a7994e2ec1e7fc151dc
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sat Mar 7 11:30:44 2020 -0500
gnu: screen: Build fix for the Hurd.
* gnu/packages/patches/screen-hurd-path-max.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/screen.scm (screen): Use it.
---
gnu/local.mk | 1 +
gnu/packages/patches/screen-hurd-path-max.patch | 42 +++++++++++++++++++++++++
gnu/packages/screen.scm | 2 ++
3 files changed, 45 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 9e4ce6c..6c9cea2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1424,6 +1424,7 @@ dist_patch_DATA =
\
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scotch-build-parallelism.patch \
%D%/packages/patches/scotch-integer-declarations.patch \
+ %D%/packages/patches/screen-hurd-path-max.patch \
%D%/packages/patches/sdl-libx11-1.6.patch \
%D%/packages/patches/sdl2-mesa-compat.patch \
%D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \
diff --git a/gnu/packages/patches/screen-hurd-path-max.patch
b/gnu/packages/patches/screen-hurd-path-max.patch
new file mode 100644
index 0000000..e906f15
--- /dev/null
+++ b/gnu/packages/patches/screen-hurd-path-max.patch
@@ -0,0 +1,42 @@
+Workaround for PATH_MAX usage on the Hurd.
+
+Taken from
https://salsa.debian.org/debian/screen/-/blob/master/debian/patches/61-default-PATH_MAX-if-undefined-for-hurd.patch
+
+Description: Set PATH_MAX to 4096 if undefined
+ Fixes FTBFS since 4.4.0 on GNU/Hurd. Updated to add one more occurrence for
4.5.0.
+Author: Axel Beckert <address@hidden>
+Bug: https://savannah.gnu.org/bugs/?50089
+Last-Updated: 2017-01-18
+
+--- a/tty.sh
++++ b/tty.sh
+@@ -1478,6 +1478,13 @@
+ return 0;
+ }
+
++/*
++ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd
++ */
++
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
+
+ int CheckTtyname (char *tty)
+ {
+--- a/screen.h
++++ b/screen.h
+@@ -109,6 +109,13 @@
+ # define DEFAULT_BUFFERFILE "/tmp/screen-exchange"
+ #endif
+
++/*
++ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd
++ */
++
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
+
+ #if defined(hpux) && !(defined(VSUSP) && defined(VDSUSP) && defined(VWERASE)
&& defined(VLNEXT))
+ # define HPUX_LTCHARS_HACK
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index 5116890..c03e2e5 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -29,6 +29,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
+ #:use-module (gnu packages hurd)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
@@ -43,6 +44,7 @@
(method url-fetch)
(uri (string-append "mirror://gnu/screen/screen-"
version ".tar.gz"))
+ (patches (search-patches "screen-hurd-path-max.patch"))
(sha256
(base32
"18ascpjzsy70h6hk7wpg8zmzjwgdyrdr7c6z4pg5z4l9hhyv24bf"))))
(build-system gnu-build-system)
- 12/31: gnu: commencement: gnumach-headers-boot0: Build from tarball., (continued)
- 12/31: gnu: commencement: gnumach-headers-boot0: Build from tarball., guix-commits, 2020/03/24
- 14/31: gnu: commencement: hurd-minimal-boot0: Build from tarball., guix-commits, 2020/03/24
- 06/31: Revert "gnu: guile-static-stripped: Update to 2.2.", guix-commits, 2020/03/24
- 09/31: gnu: bootstrap: Add support for the Hurd., guix-commits, 2020/03/24
- 04/31: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., guix-commits, 2020/03/24
- 21/31: daemon: Avoid kill -1 bug on the Hurd., guix-commits, 2020/03/24
- 10/31: gnu: java-jansi-native: Compile fix for the Hurd., guix-commits, 2020/03/24
- 17/31: gnu: commencement: gnumach-headers-boot0: Update to 1.8-116-g28b53508., guix-commits, 2020/03/24
- 18/31: gnu: commencement: glibc-final: Allow gnumach-headers references., guix-commits, 2020/03/24
- 25/31: gnu: pciutils: Build fixes for the Hurd., guix-commits, 2020/03/24
- 28/31: gnu: screen: Build fix for the Hurd.,
guix-commits <=
- 19/31: gnu: hurd: Update to hurd-headers version: 0.9-91a51672., guix-commits, 2020/03/24
- 01/31: gnu: grub: Support for the Hurd., guix-commits, 2020/03/24
- 08/31: gnu: bootstrap: Use fall-back mechanism for bootstrap-executables., guix-commits, 2020/03/24
- 27/31: gnu: inetutils: Support for the Hurd., guix-commits, 2020/03/24
- 03/31: gnu: glibc: Add clock patches for the Hurd., guix-commits, 2020/03/24
- 13/31: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/24
- 15/31: gnu: commencement: glibc-intermediate: Build fixes for the Hurd., guix-commits, 2020/03/24
- 20/31: daemon: Do not use clone on the Hurd., guix-commits, 2020/03/24
- 22/31: gnu: less: Build fix for the Hurd., guix-commits, 2020/03/24
- 24/31: gnu: shadow: Add linux-pam dependency for the Hurd., guix-commits, 2020/03/24