From b054b26a481e2e6609f6050b1bed5c2518bfb832 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 3 Nov 2016 00:58:56 +0100 Subject: gnu: sunxi-tools: Update to 1.4.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (sunxi-tools): Update to 1.4.1. [arguments]: Add "CC=gcc" "all" to #:make-flags. Remove 'fix-Makefile' phase. Add 'install' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c9563a16ed..1d577c73bc 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1859,14 +1859,14 @@ (define-public pam-krb5 (define-public sunxi-tools (package (name "sunxi-tools") - (version "1.3") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-sunxi/" "sunxi-tools/archive/v" version ".tar.gz")) (sha256 - (base32 "1iazm28gws1i8sls3gxwc5p108n56ags287zmh1rpvkn2k1az81a")) + (base32 "06qd2b4dlzbmzfy4q9n8v5rkkbmgcfdbv4nkkcp4nysi10k7cpfs")) (modules '((guix build utils))) (snippet ;; Remove binaries contained in the tarball which are only for the @@ -1882,19 +1882,16 @@ (define-public sunxi-tools `(#:tests? #f ; no tests exist #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "TARGET_TOOLS=sunxi-pio sunxi-meminfo" - "CROSS_COMPILE=") + "CROSS_COMPILE=" + "CC=gcc" + "all") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-Makefile - (lambda _ - (substitute* "Makefile" - ;; 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 [$][@] [$]\\^") "-o $@ meminfo.c")) - #t)) - (delete 'configure)))) + (delete 'configure) + (replace 'install + (lambda* (#:key make-flags #:allow-other-keys) + (zero? (apply system* "make" "install-all" "install-misc" + make-flags))))))) (home-page "https://github.com/linux-sunxi/sunxi-tools") (synopsis "Hardware management tools for Allwinner computers") (description "This package contains tools for Allwinner devices: @@ -1910,5 +1907,6 @@ (define-public sunxi-tools @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. +@item @command{sunxi-nand-image-builder}: Prepares raw NAND images. @end enumerate") (license license:gpl2+))) -- cgit v1.2.3