Re: [PATCH 1/4] gnu: Add ppp.

[宋文武]

On 2015-11-17 05:56, Mark H Weaver wrote:
> 宋文武 <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")
>
> How about #:make-flags '("CC=gcc") instead?  That's what I did in:
>
> http://git.savannah.gnu.org/cgit/guix.git/commit/?h=wip-network-manager&id=d83bc88067404d4005d6e84724901e34e3d218c9
Sure.
> > +             (substitute* "pppd/Makefile.linux"
> > +               (("/usr/include/crypt\\.h")
> > +                (string-append (assoc-ref %build-inputs "libc")
> > +                               "/include/crypt.h"))
> > +               (("/usr/include/pcap-bpf.h")
> > +                (string-append (assoc-ref %build-inputs "libpcap")
> > +                               "/include/pcap-bpf.h")))
> > +             (zero? (system* "./configure"
> > +                             (string-append "--prefix=" 
> > %output))))))))
>
> Also, instead of replacing the 'configure' phase, how about patching
> Makefile.linux in a new phase?  Our default 'configure' phase now does
> things like passing --build to ensure a deterministic build triplet,
> whereas on systems like ARM the guessed triplet depends on the build
> machine.  So, it would be good to use the default 'configure' phase 
> when
> possible.
OK.
> > +    (inputs
> > +     `(("libpcap" ,libpcap)))
> > +    (synopsis "Implementation of the Point-to-Point Protocol")
> > +    (home-page "https://ppp.samba.org/";)
> > +    (description
> > +     "The Point-to-Point Protocol (PPP) provides a standard way to 
> > establish
> > +a network connection over a serial link.  At present, this package 
> > supports IP
> > +and IPV6 and the protocols layered above them, such as TCP and UDP.")
> > +    ;; pppd, pppstats and pppdump are under BSD-style notices.
> > +    ;; some of the pppd plugins are GPL'd.
> > +    ;; chat is public domain.
> > +    (license (list bsd-3 bsd-4 gpl2+ public-domain))))
>
> Otherwise looks good to me!
Done, thanks for the review!