amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: pciutils: Support the 64bit Hurd.

Browse source 
* gnu/packages/patches/pciutils-hurd64.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/pciutils.scm (pciutils)[arguments]: Use g-expressions.  When
building for the 64bit Hurd, use it in new "apply-hurd64-patch" phase.

Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05
This commit is contained in:
Janneke Nieuwenhuizen 2024-11-07 15:19:52 +01:00
parent 82e8ef994c
commit 5482403f35
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 49 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/pciutils.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;;
@ -81,25 +81,34 @@ Each database is contained in a specific package output, such as the
"01aglgw9ds9qiswcbi2lx90lswncikrlyv8mmp4haix8542bvvci"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'unbundle-pci.ids
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(copy-file (search-input-file (or native-inputs inputs)
"share/hwdata/pci.ids")
"pci.ids")))
#$@(if (target-hurd64?)
#~((add-after 'unpack 'apply-hurd64-patch
(lambda _
(let ((patch-file
#$(local-file
(search-patch "pciutils-hurd64.patch"))))
(invoke "patch" "--force" "-p1" "-i" patch-file)))))
#~())
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
;; There's no 'configure' script, just a raw makefile.
(substitute* "Makefile"
,@(if (%current-target-system)
`((("^CROSS_COMPILE=.*$")
#$@(if (%current-target-system)
#~((("^CROSS_COMPILE=.*$")
(string-append "CROSS_COMPILE="
,(%current-target-system) "-"
#$(%current-target-system) "-"
"\n"))
(("^HOST=.*$")
(string-append "HOST="
,(gnu-triplet->nix-system
#$(gnu-triplet->nix-system
(%current-target-system)) "\n"))
;; Disable 'install' strip option, that would fail when
;; we are cross-compiling.
@ -139,7 +148,7 @@ Each database is contained in a specific package output, such as the
(invoke "make" "install" "install-lib"))))
;; Make sure programs have an RPATH so they can find libpciutils.so.
#:make-flags (list ,(string-append "CC="
#:make-flags #~(list #$(string-append "CC="
(if (%current-target-system)
(cc-for-target)
"gcc"))