diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-11-07 15:19:52 +0100 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-03 08:39:00 +0100 |
| commit | 5482403f35b2718610a06f906f1b98728dcdae1e (patch) | |
| tree | d469b903d4c7835c0419a27f7f30aeb8b76ea979 /gnu/packages/pciutils.scm | |
| parent | 82e8ef994c8eca2305f21e8a5b9ff725d5672b8a (diff) | |
gnu: pciutils: Support the 64bit Hurd.
* 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
Diffstat (limited to 'gnu/packages/pciutils.scm')
| -rw-r--r-- | gnu/packages/pciutils.scm | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index d2a352eb6b..08f1634113 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -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")) |