[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/18: gnu: cross-libc: Add patch to add 'mach_print' symbol on GNU/Hurd
From: |
guix-commits |
Subject: |
06/18: gnu: cross-libc: Add patch to add 'mach_print' symbol on GNU/Hurd. |
Date: |
Sat, 11 Apr 2020 13:26:07 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 7aad4609ae38790b7cc4e6a88b3e48ab43bc1f09
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Apr 2 16:47:40 2020 +0200
gnu: cross-libc: Add patch to add 'mach_print' symbol on GNU/Hurd.
* gnu/packages/patches/glibc-hurd-mach-print.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/cross-base.scm (cross-libc): Add 'patch-libc/hurd' phase
when 'hurd-target?' is true.
---
gnu/local.mk | 1 +
gnu/packages/cross-base.scm | 11 +++++++++--
gnu/packages/patches/glibc-hurd-mach-print.patch | 23 +++++++++++++++++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 7347222..02e9d80 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -977,6 +977,7 @@ dist_patch_DATA =
\
%D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \
%D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch \
%D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \
+ %D%/packages/patches/glibc-hurd-mach-print.patch \
%D%/packages/patches/glibc-hurd-magic-pid.patch \
%D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \
%D%/packages/patches/glibc-ldd-x86_64.patch \
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index df4570d..c213907 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -521,7 +521,12 @@ and the cross tool chain."
(("/[^ ]+/lib/libc.so.0.3")
(string-append out "/lib/libc.so.0.3"
" libmachuser.so
libhurduser.so"))))
- #t)))
+ #t))
+ (add-after 'unpack 'patch-libc/hurd
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((patch (assoc-ref inputs
+ "hurd-mach-print.patch")))
+ (invoke "patch" "-p1" "--force" "-i" patch)))))
'())))))
;; Shadow the native "kernel-headers" because glibc's recipe expects
the
@@ -537,7 +542,9 @@ and the cross tool chain."
,@(if (hurd-triplet? target)
`(("cross-mig"
,@(assoc-ref (package-native-inputs xheaders)
- "cross-mig")))
+ "cross-mig"))
+ ("hurd-mach-print.patch"
+ ,@(search-patches
"glibc-hurd-mach-print.patch")))
'())
,@(package-inputs libc) ;FIXME: static-bash
,@(package-native-inputs libc))))))
diff --git a/gnu/packages/patches/glibc-hurd-mach-print.patch
b/gnu/packages/patches/glibc-hurd-mach-print.patch
new file mode 100644
index 0000000..7fdf673
--- /dev/null
+++ b/gnu/packages/patches/glibc-hurd-mach-print.patch
@@ -0,0 +1,23 @@
+Provide a 'mach_print' symbol in libc.
+
+--- a/sysdeps/mach/hurd/i386/libc.abilist 2020-04-01 19:22:44.710088821
+0200
++++ b/sysdeps/mach/hurd/i386/libc.abilist 2020-04-01 19:22:52.062051161
+0200
+@@ -338,6 +338,7 @@
+ GLIBC_2.2.6 __mach_port_allocate F
+ GLIBC_2.2.6 __mach_port_deallocate F
+ GLIBC_2.2.6 __mach_port_insert_right F
++GLIBC_2.21 __mach_print F
+ GLIBC_2.2.6 __mach_reply_port F
+ GLIBC_2.2.6 __mach_task_self_ D 0x4
+ GLIBC_2.2.6 __mach_thread_self F
+
+--- a/mach/Versions
++++ b/mach/Versions
+@@ -56,6 +56,7 @@
+ }
+ GLIBC_2.21 {
+ __mach_host_self_;
++ mach_print;
+ }
+
+ HURD_CTHREADS_0.3 {
- branch core-updates updated (8c83069 -> 916ec91), guix-commits, 2020/04/11
- 01/18: install: 'populate-root-file-system' can be passed extra directives., guix-commits, 2020/04/11
- 02/18: vm: 'qemu-image' accepts a list of extra populate directives., guix-commits, 2020/04/11
- 04/18: gnu: gnumach: Enable kernel debugger (kbd)., guix-commits, 2020/04/11
- 03/18: vm: 'qemu-image' can pass options to the 'mkfs' command., guix-commits, 2020/04/11
- 08/18: gnu: hurd: Record the right file name of 'login'., guix-commits, 2020/04/11
- 05/18: gnu: hurd: Provide our own /libexec/rc script., guix-commits, 2020/04/11
- 06/18: gnu: cross-libc: Add patch to add 'mach_print' symbol on GNU/Hurd.,
guix-commits <=
- 13/18: gnu: libdaemon: Allow cross-compilation., guix-commits, 2020/04/11
- 14/18: gnu: libdaemon: Cross-build with --localstatedir=/var., guix-commits, 2020/04/11
- 07/18: gnu: hurd: Use a 32-bit MiG when cross-compiling., guix-commits, 2020/04/11
- 09/18: gnu: hurd: Ensure startup scripts refer to the right programs., guix-commits, 2020/04/11
- 10/18: gnu: hurd: Install the UTF-8 motd., guix-commits, 2020/04/11
- 15/18: gnu: hurd: Add dependency on libdaemon., guix-commits, 2020/04/11
- 12/18: gnu: hurd: Add dependency on libgcrypt., guix-commits, 2020/04/11
- 16/18: gnu: hurd: Install a BDF font., guix-commits, 2020/04/11
- 11/18: gnu: libgcrypt: Fix cross-compilation., guix-commits, 2020/04/11
- 17/18: gnu: cross-libc: Add patch to allow 'gettyent' reading store file names., guix-commits, 2020/04/11