[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/33: gnu: pciutils: Build fix for the Hurd.
From: |
guix-commits |
Subject: |
17/33: gnu: pciutils: Build fix for the Hurd. |
Date: |
Tue, 10 Mar 2020 03:58:47 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit fbae83142a0d3f8b46950484c32c5077df4b2a4c
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sat Mar 7 09:41:55 2020 -0500
gnu: pciutils: Build fix for the Hurd.
* gnu/packages/patches/pciutils-hurd-configure.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/pciutils.scm (pciutils): Use it.
---
gnu/local.mk | 1 +
gnu/packages/patches/pciutils-hurd-configure.patch | 31 ++++++++++++++++++++++
gnu/packages/pciutils.scm | 2 ++
3 files changed, 34 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index e702f17..c299847 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1264,6 +1264,7 @@ dist_patch_DATA =
\
%D%/packages/patches/p7zip-remove-unused-code.patch \
%D%/packages/patches/pam-mount-luks2-support.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \
+ %D%/packages/patches/pciutils-hurd-configure.patch \
%D%/packages/patches/sdl-pango-api_additions.patch \
%D%/packages/patches/sdl-pango-blit_overflow.patch \
%D%/packages/patches/sdl-pango-fillrect_crash.patch \
diff --git a/gnu/packages/patches/pciutils-hurd-configure.patch
b/gnu/packages/patches/pciutils-hurd-configure.patch
new file mode 100644
index 0000000..26219f6
--- /dev/null
+++ b/gnu/packages/patches/pciutils-hurd-configure.patch
@@ -0,0 +1,31 @@
+From e39a3af22501234a91cf28e8c57b45f9379f9101 Mon Sep 17 00:00:00 2001
+From: Damien Zammit <address@hidden>
+Date: Fri, 26 Oct 2018 09:24:04 -0400
+Subject: [PATCH 2/2] Add ability to detect GNU/Hurd when configuring
+
+---
+ lib/configure | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/lib/configure
++++ b/lib/configure
+@@ -25,7 +25,7 @@ if [ -z "$HOST" ] ; then
+ proc=`/usr/sbin/lsdev -C -c processor -S available -F name |
head -1`
+ cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
+ else
+- cpu=`uname -m | sed
's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`
++ cpu=`uname -m | sed
's/^i.86-AT386/i386/;s/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`
+ fi
+ if [ "$sys" = "DragonFly" ]
+ then
+@@ -39,6 +39,10 @@ if [ -z "$HOST" ] ; then
+ then
+ sys=cygwin
+ fi
++ if [ "$sys" = "GNU" ]
++ then
++ sys=gnu
++ fi
+ HOST=${3:-$cpu-$sys}
+ fi
+ [ -n "$RELEASE" ] && rel="${RELEASE}"
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index 45d7b49..43517d8 100644
--- a/gnu/packages/pciutils.scm
+++ b/gnu/packages/pciutils.scm
@@ -26,6 +26,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages hurd)
@@ -41,6 +42,7 @@
(uri (string-append
"mirror://kernel.org/software/utils/pciutils/pciutils-"
version ".tar.xz"))
+ (patches (search-patches "pciutils-hurd-configure.patch"))
(sha256
(base32
"0mb0f2phdcmp4kfiqsszn2k6nlln0w160ffzrjjv4bbfjwrgfzzn"))))
- 04/33: gnu: bootloader: Add grub-minimal-bootloader., (continued)
- 04/33: gnu: bootloader: Add grub-minimal-bootloader., guix-commits, 2020/03/10
- 03/33: gnu: Add grub-minimal., guix-commits, 2020/03/10
- 05/33: gnu: hurd: Fix hurd-target?., guix-commits, 2020/03/10
- 06/33: gnu: hurd: Add hurd-system?., guix-commits, 2020/03/10
- 07/33: gnu: java-jansi-native: Compile fix for the Hurd., guix-commits, 2020/03/10
- 08/33: gnu: make: Revert to 4.1 for the Hurd., guix-commits, 2020/03/10
- 01/33: gnu: flex-2.6.1: Build fix for the Hurd., guix-commits, 2020/03/10
- 11/33: gnu: glibc: Add and update patches for the Hurd., guix-commits, 2020/03/10
- 02/33: gnu: grub: Build fix for the Hurd., guix-commits, 2020/03/10
- 13/33: gnu: cross-libc: Build fix for the Hurd., guix-commits, 2020/03/10
- 17/33: gnu: pciutils: Build fix for the Hurd.,
guix-commits <=
- 25/33: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/10
- 27/33: gnu: commencement: glibc-intermediate: Build fixes for the Hurd., guix-commits, 2020/03/10
- 09/33: gnu: less: Build fix for the Hurd., guix-commits, 2020/03/10
- 18/33: gnu: shepherd: Build fix for the Hurd., guix-commits, 2020/03/10
- 10/33: gnu: fontconfig: Build fix for the Hurd., guix-commits, 2020/03/10
- 19/33: gnu: inetutils: Support for the Hurd., guix-commits, 2020/03/10
- 31/33: gnu: commencement: glibc-final: Allow gnumach-headers references., guix-commits, 2020/03/10
- 21/33: gnu: shadow: Build fix for the Hurd., guix-commits, 2020/03/10
- 12/33: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., guix-commits, 2020/03/10
- 16/33: gnu: pciutils: Remove kmod dependency for the Hurd., guix-commits, 2020/03/10