Re: [PATCH] gnu: Update sunxi-tools to 1.4

[Efraim Flashner]

On Wed, Oct 26, 2016 at 11:21:32PM +0200, Danny Milosavljevic wrote:
> ---
>  gnu/packages/admin.scm | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index d9b08ef..856d946 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -1859,14 +1859,14 @@ Kerberos and Heimdal and FAST is supported with 
> recent MIT Kerberos.")
>  (define-public sunxi-tools
>    (package
>      (name "sunxi-tools")
> -    (version "1.3")
> +    (version "1.4")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (string-append "https://github.com/linux-sunxi/";
>                             "sunxi-tools/archive/v" version ".tar.gz"))
>         (sha256
> -        (base32 "1iazm28gws1i8sls3gxwc5p108n56ags287zmh1rpvkn2k1az81a"))
> +        (base32 "1hx72cx4wj9w4c6niq0b6l3c5aj259g392z6y3a5f7fnybanq3pq"))
>         (modules '((guix build utils)))
>         (snippet
>          ;; Remove binaries contained in the tarball which are only for the
> @@ -1882,8 +1882,9 @@ Kerberos and Heimdal and FAST is supported with recent 
> MIT Kerberos.")
>       `(#:tests? #f ; no tests exist
>         #:make-flags (list (string-append "PREFIX="
>                                           (assoc-ref %outputs "out"))
> -                          "TARGET_TOOLS=sunxi-pio sunxi-meminfo"
> -                          "CROSS_COMPILE=")
> +                          "TARGET_TOOLS=sunxi-pio sunxi-meminfo 
> sunxi-script_extractor"
> +                          "CROSS_COMPILE="
> +                          "CC=gcc")

is the change in 'target-tools' necessary for the update or should/can
it be split out into a second commit?

>         #:phases
>         (modify-phases %standard-phases
>           (add-after 'unpack 'fix-Makefile
> @@ -1892,7 +1893,7 @@ Kerberos and Heimdal and FAST is supported with recent 
> MIT Kerberos.")
>                 ;; Upstream adds Makefile and config.h as dependencies
>                 ;; of all their tools which means $^ would pass them to gcc.
>                 ;; gcc won't know what to do with a Makefile.
> -               (("-o address@hidden [$]\\^") "-o $@ meminfo.c"))
> +               (("-o address@hidden [$]\\^") "-o $@ $<"))
>               #t))
>           (delete 'configure))))
>      (home-page "https://github.com/linux-sunxi/sunxi-tools";)
> @@ -1910,5 +1911,8 @@ bootloader) parameters.
>  @item @command{sunxi-pio}: Sets GPIO parameters and oscillates a GPIO
>  in order to be able to find it.
>  @item @command{sunxi-meminfo}: Prints memory bus settings.
> address@hidden @command{sunxi-nand-image-builder}: Prepares raw NAND images.
> address@hidden @command{sunxi-script_extractor}: Extracts script.bin from a
> +running Linux 3.4 kernel.
>  @end enumerate")
>      (license license:gpl2+)))
> 

-- 
Efraim Flashner   <address@hidden>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

signature.asc
Description: PGP signature