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: Use new style.

Browse source 
* gnu/packages/pciutils.scm (pciutils)[arguments]: Use G-expressions.
Simplify the use of cc-for-target.
[inputs]: Remove labels.

Change-Id: I1d19d2a8c4c01a2ea9a7b75a1fa224734710b43f
This commit is contained in:
Zheng Junjie 2025-03-03 10:20:04 +08:00 • committed by Andreas Enge
parent 2dbaceca82
commit eec2135808
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/pciutils.scm
View file

@ -91,7 +91,7 @@ Each database is contained in a specific package output, such as the
"share/hwdata/pci.ids") "share/hwdata/pci.ids")
"pci.ids"))) "pci.ids")))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda _
;; There's no 'configure' script, just a raw makefile. ;; There's no 'configure' script, just a raw makefile.
(substitute* "Makefile" (substitute* "Makefile"
#$@(if (%current-target-system) #$@(if (%current-target-system)
@ -109,13 +109,13 @@ Each database is contained in a specific package output, such as the
"STRIP=\n")) "STRIP=\n"))
'()) '())
(("^PREFIX=.*$") (("^PREFIX=.*$")
(string-append "PREFIX := " (assoc-ref outputs "out") (string-append "PREFIX := " #$output
"\n")) "\n"))
(("^MANDIR:=.*$") (("^MANDIR:=.*$")
;; By default the thing tries to automatically ;; By default the thing tries to automatically
;; determine whether to use $prefix/man or ;; determine whether to use $prefix/man or
;; $prefix/share/man, and wrongly so. ;; $prefix/share/man, and wrongly so.
(string-append "MANDIR := " (assoc-ref outputs "out") (string-append "MANDIR := " #$output
"/share/man\n")) "/share/man\n"))
(("^SHARED=.*$") (("^SHARED=.*$")
@ -136,27 +136,25 @@ Each database is contained in a specific package output, such as the
(("(.*INSTALL.*)update-pciids.8(.*)" _ head tail) (("(.*INSTALL.*)update-pciids.8(.*)" _ head tail)
(string-append head tail))))) (string-append head tail)))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda _
;; Install the commands, library, and .pc files. ;; Install the commands, library, and .pc files.
(invoke "make" "install" "install-lib")))) (invoke "make" "install" "install-lib"))))
;; Make sure programs have an RPATH so they can find libpciutils.so. ;; Make sure programs have an RPATH so they can find libpciutils.so.
#:make-flags #~(list #$(string-append "CC=" #:make-flags
(if (%current-target-system) #~(list #$(string-append "CC=" (cc-for-target))
(cc-for-target) (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
"gcc"))
(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib"))
;; No test suite. ;; No test suite.
#:tests? #f)) #:tests? #f))
(native-inputs (native-inputs
(list hwdata pkg-config which)) (list hwdata pkg-config which))
(inputs (inputs
`(,@(if (not (target-hurd?)) (append
`(("kmod" ,kmod)) (if (not (target-hurd?))
'()) (list kmod)
("zlib" ,zlib))) '())
(list zlib)))
(home-page "https://mj.ucw.cz/sw/pciutils/") (home-page "https://mj.ucw.cz/sw/pciutils/")
(synopsis "Programs for inspecting and manipulating PCI devices") (synopsis "Programs for inspecting and manipulating PCI devices")
(description (description