From 49ab267cbec17643e265305c109dc397b5e43cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 14 Sep 2021 11:07:05 +0200 Subject: [PATCH] gnu: attr: Allow compilation on GNU/Hurd. * gnu/packages/attr.scm (attr)[arguments]: Add 'skip-linux-syscalls' phase when 'hurd-target?' returns true. --- gnu/packages/attr.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/attr.scm b/gnu/packages/attr.scm index a062125303..8c1a4aca7c 100644 --- a/gnu/packages/attr.scm +++ b/gnu/packages/attr.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2012, 2013, 2016 Ludovic Courtès +;;; Copyright © 2012, 2013, 2016, 2021 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2019 Marius Bakke ;;; @@ -23,6 +23,7 @@ #:use-module (guix licenses) #:use-module (gnu packages perl) #:use-module (gnu packages gettext) + #:use-module (gnu packages hurd) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -42,6 +43,17 @@ (arguments `(#:phases (modify-phases %standard-phases + ,@(if (hurd-target?) + `((add-before 'configure 'skip-linux-syscalls + (lambda _ + ;; Starting from 2.5.1, libattr includes Linux-specific + ;; calls to syscall(2). Comment them out for GNU/Hurd + ;; and instead use the glibc-provided wrappers. + (substitute* "Makefile.in" + (("libattr/syscalls\\.c") "") + (("\tlibattr/la-syscalls\\.lo") "") + (("-Wl,[[:graph:]]+/libattr\\.lds") ""))))) + '()) (replace 'check (lambda* (#:key target #:allow-other-keys) ;; Use the right shell.