diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-18 01:26:33 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-10 11:44:34 -0500 |
commit | b082fdb4b5cebc6641affe7acf204453c39058c8 (patch) | |
tree | 95608888dc04b5ac3110730d12e2a8a90eecbf5b /gnu/packages | |
parent | eda1860d029b4c21dd1cd8168833a0e9a5f92c02 (diff) | |
download | guix-patches-b082fdb4b5cebc6641affe7acf204453c39058c8.tar guix-patches-b082fdb4b5cebc6641affe7acf204453c39058c8.tar.gz |
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/linux.scm | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 89bf3d65ca..2f9eff1151 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2903,37 +2903,33 @@ configuration (iptunnel, ipmaddr).") (define-public libcap (package (name "libcap") - (version "2.51") + (version "2.62") (source (origin - (method url-fetch) - (uri (string-append - "mirror://kernel.org/linux/libs/security/linux-privs/" - "libcap2/libcap-" version ".tar.xz")) - (sha256 - (base32 - "1ych13qc1mvzv8iscbims5b317vxcmy5ffpmfy98zk7bgamz62b6")))) - (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")))))) - #:test-target "test" - #:make-flags - (list "lib=lib" - (string-append "prefix=" (assoc-ref %outputs "out")) - "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") - '())))) + (method url-fetch) + (uri (string-append + "mirror://kernel.org/linux/libs/security/linux-privs/" + "libcap2/libcap-" version ".tar.xz")) + (sha256 + (base32 + "18l3pngsbaahdjzz01rmzrjgcqny4zld685fkq96mq5yr6m5n30r")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (delete 'configure)) + #:test-target "test" + #:make-flags + #~(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) + `((list (string-append "CROSS_COMPILE=" + ,(%current-target-system) "-") + "BUILD_CC=gcc")) + '())))) (native-inputs (list perl)) (supported-systems (delete "i586-gnu" %supported-systems)) (home-page "https://sites.google.com/site/fullycapable/") |