diff options
| author | Marius Bakke <marius@gnu.org> | 2022-06-26 11:57:04 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-06-26 12:06:32 +0200 |
| commit | 9631bd6d3085a32fb80b6bc82a8b423928608d70 (patch) | |
| tree | 0f5a9d124ba119cfef3104c2227717cea6133fda /gnu/packages/pciutils.scm | |
| parent | 24f57dadc7a38653064eb9a9cd4020abf6c2e033 (diff) | |
gnu: pciutils: Update to 3.8.0.
* gnu/packages/pciutils.scm (pciutils): Update to 3.8.0.
[source](patches): Remove.
[arguments]: Don't apply patch. Add CC in #:make-flags.
Diffstat (limited to 'gnu/packages/pciutils.scm')
| -rw-r--r-- | gnu/packages/pciutils.scm | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index acd4d5ba28..ea6bbb2702 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot> +;;; Copyright © 2022 Marius Bakke <marius@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,16 +81,15 @@ Each database is contained in a specific package output, such as the (define-public pciutils (package (name "pciutils") - (version "3.7.0") + (version "3.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/utils/pciutils/pciutils-" version ".tar.xz")) - (patches (search-patches "pciutils-hurd-configure.patch")) (sha256 (base32 - "1ss0rnfsx8gvqjxaji4mvbhf9xyih4cadmgadbwwv8mnx1xvjh4x")))) + "01aglgw9ds9qiswcbi2lx90lswncikrlyv8mmp4haix8542bvvci")))) (build-system gnu-build-system) (arguments `(#:phases @@ -147,18 +147,14 @@ Each database is contained in a specific package output, such as the (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. - (invoke "make" "install" "install-lib"))) - - ,@(if (hurd-target?) - '((add-after 'unpack 'apply-hurd-patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "hurd-patch"))) - (invoke "patch" "-p1" "--batch" "-i" - patch))))) - '())) + (invoke "make" "install" "install-lib")))) ;; Make sure programs have an RPATH so they can find libpciutils.so. - #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" + #:make-flags (list ,(string-append "CC=" + (if (%current-target-system) + (cc-for-target) + "gcc")) + (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) ;; No test suite. @@ -169,9 +165,6 @@ Each database is contained in a specific package output, such as the `(,@(if (not (hurd-target?)) `(("kmod" ,kmod)) '()) - ,@(if (hurd-target?) - `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) - '()) ("zlib" ,zlib))) (home-page "https://mj.ucw.cz/sw/pciutils/") (synopsis "Programs for inspecting and manipulating PCI devices") |