TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: ppp: Update to 2.5.0.

Browse source 
* gnu/packages/samba.scm (ppp): Update to 2.5.0.
[arguments]: Move CC from #:make-flags
to #:configure-flags where it belongs.  Remind ./configure where openssl lives.
Build verbosely.  Remove obsolete 'patch-Makefile phase, and delete autogen.sh.
[native-inputs]: Add autoconf, automake, and libtool.
This commit is contained in:
Tobias Geerinckx-Rice 2023-09-24 02:00:00 +02:00
parent bdb664f7b0
commit a112b43b2a
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/samba.scm
View file

@ -467,34 +467,30 @@ (define-public ldb
(define-public ppp (define-public ppp
(package (package
(name "ppp") (name "ppp")
(version "2.4.9") (version "2.5.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ppp-project/ppp") (url "https://github.com/ppp-project/ppp")
(commit version))) (commit (string-append "ppp-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1bhhksdclsnkw54a517ndrw55q5zljjbh9pcqz1z4a2z2flxpsgk")))) "1pkvaxi5318lvsadspj603wdkxah01vgjhywri7rv249p249vfr7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:tests? #f ;; No "check" target (list #:tests? #f ; no tests
#:make-flags #~(list (string-append "CC=" #$(cc-for-target))) #:configure-flags
#:phases #~(list (string-append "CC=" #$(cc-for-target))
#~(modify-phases %standard-phases (string-append "--with-openssl="
(add-before 'configure 'patch-Makefile (assoc-ref %build-inputs "openssl")))
(lambda* (#:key inputs #:allow-other-keys) #:make-flags #~(list "V=1") ; better build logs
(let ((openssl (assoc-ref inputs "openssl")) #:phases
(libpcap (assoc-ref inputs "libpcap"))) #~(modify-phases %standard-phases
(substitute* "pppd/Makefile.linux" (add-before 'bootstrap 'no-/bin/sh
(("/usr/include/openssl") (lambda _ (delete-file "autogen.sh"))))))
(string-append openssl "/include")) (native-inputs
(("-DPPP_FILTER") (list autoconf automake libtool))
(string-append "-DPPP_FILTER -I" libpcap "/include")))
(substitute* "pppd/pppcrypt.h"
(("des\\.h") "openssl/des.h")))
#t)))))
(inputs (inputs
(list libpcap openssl)) (list libpcap openssl))
(synopsis "Implementation of the Point-to-Point Protocol") (synopsis "Implementation of the Point-to-Point Protocol")