[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/4] gnu: Add ppp.
From: |
Mark H Weaver |
Subject: |
Re: [PATCH 1/4] gnu: Add ppp. |
Date: |
Mon, 16 Nov 2015 16:59:30 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
宋文武 <address@hidden> writes:
> * gnu/packages/samba.scm (ppp): New variable.
> ---
> gnu/packages/samba.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
> index d7223bc..8d86249 100644
> --- a/gnu/packages/samba.scm
> +++ b/gnu/packages/samba.scm
> @@ -23,6 +23,7 @@
> #:use-module (guix build-system gnu)
> #:use-module (guix licenses)
> #:use-module (gnu packages acl)
> + #:use-module (gnu packages admin)
> #:use-module (gnu packages popt)
> #:use-module (gnu packages openldap)
> #:use-module (gnu packages readline)
> @@ -196,3 +197,44 @@ Desktops into Active Directory environments using the
> winbind daemon.")
> "Talloc is a hierarchical, reference counted memory pool system with
> destructors. It is the core memory allocator used in Samba.")
> (license gpl3+))) ;; The bundled "replace" library uses LGPL3.
> +
> +(define-public ppp
> + (package
> + (name "ppp")
> + (version "2.4.7")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "https://www.samba.org/ftp/ppp/ppp-"
> + version ".tar.gz"))
> + (sha256
> + (base32
> + "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02"))))
> + (build-system gnu-build-system)
> + (arguments
> + '(#:tests? #f ; no check target
> + #:phases
> + (modify-phases %standard-phases
> + (replace 'configure
> + (lambda _
> + (setenv "CC" "gcc")
> + (substitute* "pppd/Makefile.linux"
> + (("/usr/include/crypt\\.h")
> + (string-append (assoc-ref %build-inputs "libc")
Sorry, one more thing: instead of using %build-inputs, please add
'inputs' as a keyword argument to this phase procedure and use that.
> + "/include/crypt.h"))
> + (("/usr/include/pcap-bpf.h")
> + (string-append (assoc-ref %build-inputs "libpcap")
Ditto.
> + "/include/pcap-bpf.h")))
> + (zero? (system* "./configure"
> + (string-append "--prefix=" %output))))))))
I would say ditto for %output, but ideally this should be left to the
default 'configure' phase, as I suggested in my earlier message.
Thanks,
Mark
- Re: [PATCH 2/4] gnu: Add network-manager., (continued)
- Re: [PATCH 1/4] gnu: Add ppp., Mark H Weaver, 2015/11/16
- Re: [PATCH 1/4] gnu: Add ppp.,
Mark H Weaver <=