mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-17 20:27:36 -05:00
gnu: libpcap: Update to 2.62.
* gnu/packages/linux.scm (libpcap): Update to 2.62. [phases]{configure}: Delete phase, and move LDFLAGS to... [make-flags]: ... here. Define arguments via G-expressions.
This commit is contained in:
parent
eda1860d02
commit
b082fdb4b5
1 changed files with 25 additions and 29 deletions
|
@ -2903,7 +2903,7 @@ (define-public net-tools
|
|||
(define-public libcap
|
||||
(package
|
||||
(name "libcap")
|
||||
(version "2.51")
|
||||
(version "2.62")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -2911,28 +2911,24 @@ (define-public libcap
|
|||
"libcap2/libcap-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ych13qc1mvzv8iscbims5b317vxcmy5ffpmfy98zk7bgamz62b6"))))
|
||||
"18l3pngsbaahdjzz01rmzrjgcqny4zld685fkq96mq5yr6m5n30r"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:phases
|
||||
,#~(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
;; Add $libdir to the RUNPATH of executables.
|
||||
(lambda _
|
||||
(substitute* "Make.Rules"
|
||||
(("LDFLAGS \\?= #-g")
|
||||
(string-append "LDFLAGS ?= -Wl,-rpath="
|
||||
#$output "/lib"))))))
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure))
|
||||
#:test-target "test"
|
||||
#:make-flags
|
||||
(list "lib=lib"
|
||||
(string-append "prefix=" (assoc-ref %outputs "out"))
|
||||
#~(list "lib=lib"
|
||||
(string-append "prefix=" #$output)
|
||||
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
|
||||
"RAISE_SETFCAP=no"
|
||||
;; Tell the makefile to use TARGET-gcc and friends
|
||||
;; when cross-compiling.
|
||||
,@(if (%current-target-system)
|
||||
`(,(string-append "CROSS_COMPILE="
|
||||
(%current-target-system) "-")
|
||||
"BUILD_CC=gcc")
|
||||
#$@(if (%current-target-system)
|
||||
`((list (string-append "CROSS_COMPILE="
|
||||
,(%current-target-system) "-")
|
||||
"BUILD_CC=gcc"))
|
||||
'()))))
|
||||
(native-inputs (list perl))
|
||||
(supported-systems (delete "i586-gnu" %supported-systems))
|
||||
|
|
Loading…
Reference in a new issue