me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Maxim Cournoyer 2021-12-18 01:26:33 -05:00
parent eda1860d02
commit b082fdb4b5
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/packages/linux.scm
View File

@ -2903,7 +2903,7 @@ configuration (iptunnel, ipmaddr).")
(define-public libcap (define-public libcap
(package (package
(name "libcap") (name "libcap")
(version "2.51") (version "2.62")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2911,28 +2911,24 @@ configuration (iptunnel, ipmaddr).")
"libcap2/libcap-" version ".tar.xz")) "libcap2/libcap-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ych13qc1mvzv8iscbims5b317vxcmy5ffpmfy98zk7bgamz62b6")))) "18l3pngsbaahdjzz01rmzrjgcqny4zld685fkq96mq5yr6m5n30r"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments `(#:phases (arguments
,#~(modify-phases %standard-phases (list #:phases
(replace 'configure #~(modify-phases %standard-phases
;; Add $libdir to the RUNPATH of executables. (delete 'configure))
(lambda _
(substitute* "Make.Rules"
(("LDFLAGS \\?= #-g")
(string-append "LDFLAGS ?= -Wl,-rpath="
#$output "/lib"))))))
#:test-target "test" #:test-target "test"
#:make-flags #:make-flags
(list "lib=lib" #~(list "lib=lib"
(string-append "prefix=" (assoc-ref %outputs "out")) (string-append "prefix=" #$output)
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
"RAISE_SETFCAP=no" "RAISE_SETFCAP=no"
;; Tell the makefile to use TARGET-gcc and friends ;; Tell the makefile to use TARGET-gcc and friends
;; when cross-compiling. ;; when cross-compiling.
,@(if (%current-target-system) #$@(if (%current-target-system)
`(,(string-append "CROSS_COMPILE=" `((list (string-append "CROSS_COMPILE="
(%current-target-system) "-") ,(%current-target-system) "-")
"BUILD_CC=gcc") "BUILD_CC=gcc"))
'())))) '()))))
(native-inputs (list perl)) (native-inputs (list perl))
(supported-systems (delete "i586-gnu" %supported-systems)) (supported-systems (delete "i586-gnu" %supported-systems))