guix_mirror_bot pushed a commit to branch master
in repository guix.
commit d48a3379d1b19ef24d98ed6f3d932b9d545cbcb8
Author: Efraim Flashner <[email protected]>
AuthorDate: Mon Dec 1 10:35:21 2025 +0200
gnu: libcap: Fix build on powerpc-linux.
* gnu/packages/linux.scm (libcap)[arguments]: When building for
powerpc-linux add a phase to apply a patch.
* gnu/packages/patches/libcap-magic-glibc-constant.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: I3d2d7d09684af604b17b13ffbcfcc31db46d2d82
---
gnu/local.mk | 1 +
gnu/packages/linux.scm | 11 +++++-
.../patches/libcap-magic-glibc-constant.patch | 43 ++++++++++++++++++++++
3 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index bd1920ce5c..f110841381 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1725,6 +1725,7 @@ dist_patch_DATA =
\
%D%/packages/patches/libbraiding-no-s.patch \
%D%/packages/patches/libcaca-CVE-2021-3410-pt1.patch \
%D%/packages/patches/libcaca-CVE-2021-3410-pt2.patch \
+ %D%/packages/patches/libcap-magic-glibc-constant.patch \
%D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
%D%/packages/patches/libcanberra-wayland-crash.patch \
%D%/packages/patches/libcroco-CVE-2020-12825.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1ef168b144..83dc35610f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4903,7 +4903,16 @@ configuration (iptunnel, ipmaddr).")
(arguments
(list #:phases
#~(modify-phases %standard-phases
- (delete 'configure))
+ (delete 'configure)
+ #$@(if (target-ppc32?)
+ #~((add-after 'unpack 'apply-patch
+ (lambda _
+ (let ((patch
+ #$(local-file
+ (search-patch
+ "libcap-magic-glibc-constant.patch"))))
+ (invoke "patch" "--force" "-p1" "-i" patch)))))
+ #~()))
#:test-target "test"
#:make-flags
#~(list "lib=lib"
diff --git a/gnu/packages/patches/libcap-magic-glibc-constant.patch
b/gnu/packages/patches/libcap-magic-glibc-constant.patch
new file mode 100644
index 0000000000..a4aca5ef8c
--- /dev/null
+++ b/gnu/packages/patches/libcap-magic-glibc-constant.patch
@@ -0,0 +1,43 @@
+This patch is from the upstream repo, from between the tags libcap-2.75
+and libcap-2.76, and can be removed after the update to 2.76.
+
+From 04b285680bfb45117af685eabf1675917118bdb5 Mon Sep 17 00:00:00 2001
+Message-ID:
<04b285680bfb45117af685eabf1675917118bdb5.1764517342.git.efr...@flashner.co.il>
+From: "Andrew G. Morgan" <[email protected]>
+Date: Sat, 22 Mar 2025 09:49:50 -0700
+Subject: [PATCH] Glibc needs a constant to be defined for puts() to work.
+
+See https://bugzilla.kernel.org/show_bug.cgi?id=219880
+
+Signed-off-by: Andrew G. Morgan <[email protected]>
+---
+ libcap/execable.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/libcap/execable.h b/libcap/execable.h
+index 89e61a3..a68ea24 100644
+--- a/libcap/execable.h
++++ b/libcap/execable.h
+@@ -23,6 +23,17 @@
+ #endif
+ #define __EXECABLE_H
+
++#ifdef __GLIBC__
++/*
++ * https://bugzilla.kernel.org/show_bug.cgi?id=219880 So far as I can
++ * tell this value is some legacy magic meaning, but is a detail no
++ * longer important to glibc. Only the existence of this constant in
++ * the linkage is needed.
++ */
++extern const int _IO_stdin_used;
++const int _IO_stdin_used __attribute__((weak)) = 131073;
++#endif /* def __GLIBC__ */
++
+ const char __execable_dl_loader[] __attribute((section(".interp"))) =
+ SHARED_LOADER ;
+
+--
+Efraim Flashner <[email protected]> אפרים פלשנר
+GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
+Confidentiality cannot be guaranteed on emails sent or received unencrypted
+
