From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 19 08:46:33 2019 Received: (at submit) by debbugs.gnu.org; 19 Oct 2019 12:46:33 +0000 Received: from localhost ([127.0.0.1]:52074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iLo7s-0004gt-Rc for submit@debbugs.gnu.org; Sat, 19 Oct 2019 08:46:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:39789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iLo7q-0004gl-UJ for submit@debbugs.gnu.org; Sat, 19 Oct 2019 08:46:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34945) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLo7p-0004wK-7C for guix-patches@gnu.org; Sat, 19 Oct 2019 08:46:30 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLo7n-00041v-LX for guix-patches@gnu.org; Sat, 19 Oct 2019 08:46:29 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:56504) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLo7n-0003xr-B5 for guix-patches@gnu.org; Sat, 19 Oct 2019 08:46:27 -0400 Received: from dayas.fritz.box (unknown [185.17.13.127]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 5C6B733655A5; Sat, 19 Oct 2019 14:46:22 +0200 (CEST) From: Danny Milosavljevic To: guix-patches@gnu.org Subject: [PATCH] gnu: sunxi-tools: Simplify build. Date: Sat, 19 Oct 2019 14:46:16 +0200 Message-Id: <20191019124616.19256-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 85.13.145.193 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/admin.scm (sunxi-tools-source): New procedure. (sunxi-target-tools): New variable. (sunxi-tools)[source]: Use sunxi-tools-source. [native-inputs]: Remove cross-gcc, cross-libc, cross-libc-static. Add sunxi-target-tools. [arguments]<#:make-flags>: Modify. [arguments]<#:phases>[set-environment-up]: Delete phase. [build-armhf]: Delete phase. [install]: Modify. --- gnu/packages/admin.scm | 99 ++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 82f1bb4eb8..3d967f185e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2558,11 +2558,7 @@ Kerberos and Heimdal and FAST is supported with re= cent MIT Kerberos.") ;; clause requiring us to give all recipients a copy. (license license:gpl1+))) =20 -(define-public sunxi-tools - (package - (name "sunxi-tools") - (version "1.4.2") - (source +(define (sunxi-tools-source version) (origin (method git-fetch) (uri (git-reference @@ -2577,14 +2573,49 @@ Kerberos and Heimdal and FAST is supported with r= ecent MIT Kerberos.") '(begin (delete-file-recursively "bin") #t)) - (file-name (git-file-name name version)))) + (file-name (git-file-name "sunxi-tools" version)))) + +(define sunxi-target-tools + (package + (name "sunxi-target-tools") + (version "1.4.2") + (build-system gnu-build-system) + (source + (sunxi-tools-source version)) + (arguments + `(#:system "armhf-linux" + #:tests? #f + #:make-flags (list (string-append "PREFIX=3D" + (assoc-ref %outputs "out")) + (string-append "CROSS_COMPILE=3D") + "CC=3Dgcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "target-tools" make-flags))) + (replace 'install + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install-target-tools" + 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: +@enumerate +@item @command{sunxi-meminfo}: Prints memory bus settings. +@end enumerate") + (license license:gpl2+))) + +(define-public sunxi-tools + (package + (name "sunxi-tools") + (version "1.4.2") + (source + (sunxi-tools-source version)) (native-inputs - `(("pkg-config" ,pkg-config) - ("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf" - #:xbinutils (cross-binutils "arm-linux-g= nueabihf") - #:libc (cross-libc "arm-linux-gnueabihf"= ))) - ("cross-libc" ,(cross-libc "arm-linux-gnueabihf")) ; header files - ("cross-libc-static" ,(cross-libc "arm-linux-gnueabihf") "static"= ))) + `(("sunxi-target-tools" ,sunxi-target-tools) + ("pkg-config" ,pkg-config))) (inputs `(("libusb" ,libusb))) (build-system gnu-build-system) @@ -2592,50 +2623,22 @@ Kerberos and Heimdal and FAST is supported with r= ecent MIT Kerberos.") `(#:tests? #f ; no tests exist #:make-flags (list (string-append "PREFIX=3D" (assoc-ref %outputs "out")) - (string-append "CROSS_COMPILE=3D" - "arm-linux-gnueabihf-") + (string-append "CROSS_COMPILE=3Ddisabled") "CC=3Dgcc") #:phases (modify-phases %standard-phases (delete 'configure) - (add-before 'build 'set-environment-up - (lambda* (#:key make-flags #:allow-other-keys) - (define (cross? x) - (string-contains x "cross-arm-linux")) - (define (filter-environment! filter-predicate - environment-variable-names) - (for-each - (lambda (env-name) - (when (getenv env-name) - (let* ((env-value (getenv env-name)) - (search-path (search-path-as-string->list env= -value)) - (new-search-path (filter filter-predicate - search-path)) - (new-env-value (list->search-path-as-string - new-search-path ":"))) - (setenv env-name new-env-value)))) - environment-variable-names)) - (setenv "CROSS_CPATH" (getenv "CPATH")) - (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) - (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_P= ATH")) - (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (filter-environment! cross? - '("CROSS_CPATH" "CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUD= E_PATH" - "CROSS_LIBRARY_PATH")) - (filter-environment! (lambda (e) (not (cross? e))) - '("CPATH" "C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" - "LIBRARY_PATH")) - #t)) (replace 'build (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "tools" "misc" make-flags))) - (add-after 'build 'build-armhf - (lambda* (#:key make-flags #:allow-other-keys) - (setenv "LIBRARY_PATH" #f) - (apply invoke "make" "target-tools" make-flags))) (replace 'install - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install-all" "install-misc" + (lambda* (#:key inputs outputs make-flags #:allow-other-keys) + ;; Those tools have been built for armhf but are part of th= e + ;; installation in the upstream package. So do the same + ;; here. + (copy-recursively (assoc-ref inputs "sunxi-target-tools") + (assoc-ref outputs "out")) + (apply invoke "make" "install-tools" "install-misc" make-flags)))))) (home-page "https://github.com/linux-sunxi/sunxi-tools") (synopsis "Hardware management tools for Allwinner computers") From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 04 11:54:07 2019 Received: (at 37823) by debbugs.gnu.org; 4 Dec 2019 16:54:07 +0000 Received: from localhost ([127.0.0.1]:42561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icXuU-0008AN-BX for submit@debbugs.gnu.org; Wed, 04 Dec 2019 11:54:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icXuQ-0008A8-2O for 37823@debbugs.gnu.org; Wed, 04 Dec 2019 11:53:50 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1icXuE-0006vE-P5; Wed, 04 Dec 2019 11:53:40 -0500 Received: from [160.174.176.236] (port=48140 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1icXuA-00082M-Kl; Wed, 04 Dec 2019 11:53:37 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Danny Milosavljevic Subject: Re: [bug#37823] [PATCH] gnu: sunxi-tools: Simplify build. References: <20191019124616.19256-1-dannym@scratchpost.org> Date: Wed, 04 Dec 2019 17:53:29 +0100 In-Reply-To: <20191019124616.19256-1-dannym@scratchpost.org> (Danny Milosavljevic's message of "Sat, 19 Oct 2019 14:46:16 +0200") Message-ID: <871rtkdoc6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37823 Cc: 37823@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Danny, Danny Milosavljevic skribis: > * gnu/packages/admin.scm (sunxi-tools-source): New procedure. > (sunxi-target-tools): New variable. > (sunxi-tools)[source]: Use sunxi-tools-source. > [native-inputs]: Remove cross-gcc, cross-libc, cross-libc-static. > Add sunxi-target-tools. > [arguments]<#:make-flags>: Modify. > [arguments]<#:phases>[set-environment-up]: Delete phase. > [build-armhf]: Delete phase. > [install]: Modify. Looks like it had fallen through the cracks, but it LGTM! Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 04 13:00:06 2019 Received: (at 37823-done) by debbugs.gnu.org; 4 Dec 2019 18:00:06 +0000 Received: from localhost ([127.0.0.1]:42655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icYwY-0007C6-D3 for submit@debbugs.gnu.org; Wed, 04 Dec 2019 13:00:06 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:44004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icYwX-0007By-Ab for 37823-done@debbugs.gnu.org; Wed, 04 Dec 2019 13:00:05 -0500 Received: from localhost (77.117.166.191.wireless.dyn.drei.com [77.117.166.191]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 6B18D3366ABF; Wed, 4 Dec 2019 19:00:03 +0100 (CET) Date: Wed, 4 Dec 2019 18:59:58 +0100 From: Danny Milosavljevic To: Ludovic =?ISO-8859-1?Q?Court=E8s?= Subject: Re: [bug#37823] [PATCH] gnu: sunxi-tools: Simplify build. Message-ID: <20191204185958.4dbac91e@scratchpost.org> In-Reply-To: <871rtkdoc6.fsf@gnu.org> References: <20191019124616.19256-1-dannym@scratchpost.org> <871rtkdoc6.fsf@gnu.org> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/h/m8Y5Yu0wc7Q=tEdVPjaZM"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37823-done Cc: 37823-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/h/m8Y5Yu0wc7Q=tEdVPjaZM Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, pushed to guix master as commit 208e743415d7c36e9684851a31cc30dec16db2c3. thanks! --Sig_/h/m8Y5Yu0wc7Q=tEdVPjaZM Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl3n9B4ACgkQ5xo1VCww uqXBrQf/TCmRJfnLQyaazW9CADCmTI5TUlxRch+5fxus3BJc61wTyEX0p3rGmNB8 qW7BNiEInLmtdSgdMdBhygtN+uZnj8wE+kx641PbzYaG2d83m7Nrr3wBafXIAnmS vOv/ag9yrX8/CK2u3xshbEI1CkSmno8RmsoSLSgQh3HTy5fiSieeQLGhYPPtm34S eBZfIg+ui5oKCpX0CI01OytQe0D9anvPcLtOkpCn63kgVL+eCVRwv90YUie9sjfu NfuyV+T33N2uonFx11m97YKQDyw+Bw4R2kH8HpQ5tY74GkMkIAhGCCy6QFYXR2IY JO/0d2ES4+XSlh7sVpBDjBNHehSpCw== =nP1e -----END PGP SIGNATURE----- --Sig_/h/m8Y5Yu0wc7Q=tEdVPjaZM-- From unknown Thu Aug 14 18:40:17 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 02 Jan 2020 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator