From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 02 07:54:25 2022 Received: (at submit) by debbugs.gnu.org; 2 Aug 2022 11:54:25 +0000 Received: from localhost ([127.0.0.1]:42687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqTh-0007iz-Da for submit@debbugs.gnu.org; Tue, 02 Aug 2022 07:54:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:39438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqTf-0007ir-S2 for submit@debbugs.gnu.org; Tue, 02 Aug 2022 07:54:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIqTf-00084A-Li for guix-patches@gnu.org; Tue, 02 Aug 2022 07:54:23 -0400 Received: from michel.telenet-ops.be ([2a02:1800:110:4::f00:18]:35968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIqTd-0008VR-Br for guix-patches@gnu.org; Tue, 02 Aug 2022 07:54:23 -0400 Received: from [IPV6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16] ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by michel.telenet-ops.be with bizsmtp id 2buJ2800620ykKC06buJLN; Tue, 02 Aug 2022 13:54:18 +0200 Message-ID: <8d9f6385-f835-e082-9b2c-730b311c2eca@telenet.be> Date: Tue, 2 Aug 2022 13:54:18 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: guix-patches@gnu.org From: Maxime Devos Subject: [PATCH 0/4] build-system/perl: Support some cross-compilation, and test with xdg-utils Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------Xhc4vNhI5YLohpm80a5ntScy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1659441258; bh=hoG/xFgonQuZ8XtZ6cTRiVGDMWSP6wNcfsQg2XDfXaQ=; h=Date:To:From:Subject; b=mwA0Zw4m3by8CAvBaoKnWoU4VSzri99UFjH7loqrdabIc+m17O33B0xwIYXJy43ye 4zJAedq+vdT8YTnmsKpMeHgJhpJIhvInZ/IrDL/MAx57p3NN7UlFdG9SUI1HS1m247 0JAT3EjbCyMnCsaVWH+lC7tmmHBjiYy//0/8pK3XkiabgXiEgzHuRVLGv0DVJWN2fu EtOL6joIa/vTK7p7dP/7K6KAj0V6U8rXC5IyzG9kIjHhbhRkCqb7SuYoCurI5nb9gz PvKaWEHhkqgfZxsD0gYf3UtfEVitwJSRchlg6NbXrqj1s3W3e130UkYFqP4f5qW15m gzjpT1EbTHbrQ== Received-SPF: pass client-ip=2a02:1800:110:4::f00:18; envelope-from=maximedevos@telenet.be; helo=michel.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit 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: -2.3 (--) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Xhc4vNhI5YLohpm80a5ntScy Content-Type: multipart/mixed; boundary="------------RmyluVx4Xv5Y8yVYKsHlMVQI"; protected-headers="v1" From: Maxime Devos To: guix-patches@gnu.org Message-ID: <8d9f6385-f835-e082-9b2c-730b311c2eca@telenet.be> Subject: [PATCH 0/4] build-system/perl: Support some cross-compilation, and test with xdg-utils --------------RmyluVx4Xv5Y8yVYKsHlMVQI Content-Type: multipart/mixed; boundary="------------jrMjupuaQxaPcRuax25W9NJf" --------------jrMjupuaQxaPcRuax25W9NJf Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 U3VwcG9ydGluZyBjcm9zcy1jb21waWxhdGlvbiBvZiB4ZGctdXRpbHMgb3BlbnMgdGhlIHdh eSB0byB0cnlpbmcgDQpjcm9zcy1jb21waWxhdGlvbiBvZiBRdCB0aGluZ3MuDQoNClRoaW5n cyBsaWtlIFhTIGFyZSB1bnN1cHBvcnRlZCAtLSBnb2luZyBieSANCmh0dHBzOi8vYXJzdi5n aXRodWIuaW8vcGVybC1jcm9zcy9tb2R1bGVzLmh0bWwgYW5kIHRoZSB3ZWIgcGFnZSB0aGF0 IA0Kc3RhdGVzIHRoYXQgZXh0ZXJuYWwgbW9kdWxlcyBuZWVkIHRvIGJlIGNvcGllZCBpbnRv IFBlcmwgZmlyc3QgKGJ1dCANCndoaWNoIEkgY2Fubm90IGZpbmQgYW55bW9yZSksIGl0IHNv dW5kcyByYXRoZXIgY29tcGxpY2F0ZWQuDQoNCkdyZWVldGluZ3MsDQpNYXhpbWUuDQoNCg== --------------jrMjupuaQxaPcRuax25W9NJf Content-Type: application/pgp-keys; name="OpenPGP_0x49E3EE22191725EE.asc" Content-Disposition: attachment; filename="OpenPGP_0x49E3EE22191725EE.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX4ch6BYJKwYBBAHaRw8BAQdANPb/d6MrGnGi5HyvODCkBUJPRjiFQcRU5V+m xvMaAa/NL01heGltZSBEZXZvcyA8bWF4aW1lLmRldm9zQHN0dWRlbnQua3VsZXV2 ZW4uYmU+wpAEExYIADgWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCX4ch6AIbAwUL CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBJ4+4iGRcl7japAQC3opZ2KGWzWmRc /gIWSu0AAcfMwyinFEEPa/QhUt2CogD/e2RdF4CYAgaRHJJmZ9WU7piKbLZ7llB4 LzgezVDHggzNJU1heGltZSBEZXZvcyA8bWF4aW1lZGV2b3NAdGVsZW5ldC5iZT7C kAQTFggAOBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJf56ycAhsDBQsJCAcDBRUK CQgLBRYCAwEAAh4BAheAAAoJEEnj7iIZFyXujpQBAKV1SwDDl4f24rXciDlB9L8W ycZt30CgbewMSRQk4mvbAP9dFMbVVixYBd6C8cfhR+NsOBGiOJnQABlUmgNuqGFJ Dc44BF+HIegSCisGAQQBl1UBBQEBB0BOlzIWiJzgobMF6/cqwLaLk7jIcFSZ++c0 k9cCNT6YXwMBCAfCeAQYFggAIBYhBMHzPuIMUo/bfdcBH0nj7iIZFyXuBQJfhyHo AhsMAAoJEEnj7iIZFyXuMr0BAJc8cl5PGvVmVuSQVKjleNl4DK1/XAaPAYPe34AE fZJPAP9IqLCQhH/FeJanHqBP8gNdGNI2qn8RnnLVfRJgUjZ1BA=3D=3D =3DOVqp -----END PGP PUBLIC KEY BLOCK----- --------------jrMjupuaQxaPcRuax25W9NJf-- --------------RmyluVx4Xv5Y8yVYKsHlMVQI-- --------------Xhc4vNhI5YLohpm80a5ntScy Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYukQagUDAAAAAAAKCRBJ4+4iGRcl7gOT AQD6vw1mKF8LzfZnal2/i+LsdHLW0XbPkrimV9zNRmNu9wD/eOauarqa4P4mc+rDFLAi5uXYxvyQ eoVV5GDuG+pHUAg= =Z9KN -----END PGP SIGNATURE----- --------------Xhc4vNhI5YLohpm80a5ntScy-- From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 02 08:13:38 2022 Received: (at 56882) by debbugs.gnu.org; 2 Aug 2022 12:13:38 +0000 Received: from localhost ([127.0.0.1]:42746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmI-0008Hl-9D for submit@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:38 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:54762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmC-0008HI-Ue for 56882@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:37 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by andre.telenet-ops.be with bizsmtp id 2cDX2800520ykKC01cDXHW; Tue, 02 Aug 2022 14:13:31 +0200 From: Maxime Devos To: 56882@debbugs.gnu.org Subject: [PATCH 1/4] build-system/perl: Support cross-compilation of some Perl packages. Date: Tue, 2 Aug 2022 14:13:26 +0200 Message-Id: <20220802121329.22276-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1659442411; bh=nF70CoepL5e6um9MZwA2FKzXb0HhI+4zbrazmXKJ6u0=; h=From:To:Cc:Subject:Date; b=Mpunwo1p7+fx4gfJJZObefceNcYKSR+OgFQHc984yC06gRtOZKwIVWngrgJcBpvFn M8aDkbEfeeX3CUcBDb1RYUfpsz8NfLKRjL35+blbd1ed+5GO+cjk4Yapv73Vb59xuF cparnSrn7XkwFS81rgPKwRaay6IxEXzku49j9gpFXA3b2ZhFRCuTRhs+/hKEalBmio k/rgDLmy9bbTB7Kvapx9eEMHZzG1IBBclC0yr6L3WTn0Q+LDi0Eo3bWPAQEWfUpDMh sC5pLLaa1I2XtCtbiQMHKTx7fg917g06S/RIwp8kEIr7nh3amF4o2594Q8RhaPqe2M DavcMbeotezsg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 56882 Cc: Maxime Devos 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 (-) * guix/build-system/perl.scm: Add info on cross-compilation. (lower)[private-keywords]: Remove #:target when cross-compiling. (lower)[target]: Set. (host-inputs)[perl]: New entry. (host-inputs)[(standard-packages)]: Move to ... (build-inputs)[(standard-packages)]: ... here when cross-compiling. (build-inputs)[standard-cross-packages]: Add when cross-compiling. (target-inputs): New entry when cross-compiling. (build): Use perl-cross-build when cross-compiling. (perl-cross-build): New procedure. --- guix/build-system/perl.scm | 120 +++++++++++++++++++++++++++++++------ 1 file changed, 103 insertions(+), 17 deletions(-) diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index db0a916fb2..3890cd91ea 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2021 Ludovic Courtès +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,13 +30,17 @@ (define-module (guix build-system perl) #:use-module (ice-9 match) #:export (%perl-build-system-modules perl-build + perl-cross-build perl-build-system)) ;; Commentary: ;; ;; Standard build procedure for Perl packages using the "makefile ;; maker"---i.e., "perl Makefile.PL". This is implemented as an extension of -;; `gnu-build-system'. +;; `gnu-build-system'. Cross-compilation is supported for some simple Perl +;; packages, but not for any Perl packages that do things like XS (Perl's FFI), +;; which makes C-style shared libraries, as it is currently not known how to +;; tell Perl to properly cross-compile. ;; ;; Code: @@ -59,24 +64,43 @@ (define* (lower name #:rest arguments) "Return a bag for NAME." (define private-keywords - '(#:target #:perl #:inputs #:native-inputs)) + `(#:perl #:inputs #:native-inputs + ,@(if target '() '(#:target)))) - (and (not target) ;XXX: no cross-compilation - (bag - (name name) - (system system) - (host-inputs `(,@(if source - `(("source" ,source)) - '()) - ,@inputs + (bag + (name name) + (system system) (target target) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@inputs + ;; For interpreters in #! (shebang) + ,@(if target + `(("perl" ,perl)) + '()) - ;; Keep the standard inputs of 'gnu-build-system'. - ,@(standard-packages))) - (build-inputs `(("perl" ,perl) - ,@native-inputs)) - (outputs outputs) - (build perl-build) - (arguments (strip-keyword-arguments private-keywords arguments))))) + ;; Keep the standard inputs of 'gnu-build-system'. + ;; TODO: make this unconditional, putting this into 'build-inputs'. + ,@(if target + '() + (standard-packages)))) + (build-inputs `(("perl" ,perl) + ,@native-inputs + ,@(if target + (standard-cross-packages target 'host) + '()) + ,@(if target + (standard-packages) + '()))) + ;; Keep the standard inputs of 'gnu-build-system'. + (target-inputs (if target + (standard-cross-packages target 'target) + '())) + (outputs outputs) + (build (if target + perl-cross-build + perl-build)) + (arguments (strip-keyword-arguments private-keywords arguments)))) (define* (perl-build name inputs #:key source @@ -127,6 +151,68 @@ (define build (gexp->derivation name build #:system system #:target #f + #:graft? #f + #:guile-for-build guile))) + +(define* (perl-cross-build name #:key + source + target + build-inputs host-inputs target-inputs + (search-paths '()) + (native-search-paths '()) + (tests? #f) ; usually not possible when cross-compiling + (parallel-build? #t) + (parallel-tests? #t) + (make-maker? #f) + (make-maker-flags ''()) + (module-build-flags ''()) + (phases '(@ (guix build perl-build-system) + %standard-phases)) + (outputs '("out")) + (system (%current-system)) + (build (nix-system->gnu-triplet system)) + (guile #f) + (imported-modules %perl-build-system-modules) + (modules '((guix build perl-build-system) + (guix build utils)))) + "Cross-build SOURCE to TARGET using PERL, and with INPUTS. This assumes that +SOURCE provides a `Makefile.PL' file as its build system and does not use XS +or similar." + (define inputs + #~(append #$(input-tuples->gexp host-inputs) + #+(input-tuples->gexp target-inputs))) + (define builder + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) + (perl-build #:name #$name + #:source #+source + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:native-search-paths '#$(sexp->gexp + (map search-path-specification->sexp + native-search-paths)) + #:make-maker? #$make-maker? + #:make-maker-flags #$make-maker-flags + #:module-build-flags #$(sexp->gexp module-build-flags) + #:phases #$phases + #:build #$build + #:system #$system + #:target #$target + #:test-target "test" + #:tests? #$tests? + #:parallel-build? #$parallel-build? + #:parallel-tests? #$parallel-tests? + #:outputs #$(outputs->gexp outputs) + #:inputs #$inputs + #:native-inputs #+(input-tuples->gexp build-inputs))))) + (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) + system #:graft? #f))) + (gexp->derivation name builder + #:system system + #:target target + #:graft? #false #:guile-for-build guile))) (define perl-build-system base-commit: d519305d83d08058e4def2c4d72fe62102d9599d -- 2.37.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 02 08:13:39 2022 Received: (at 56882) by debbugs.gnu.org; 2 Aug 2022 12:13:39 +0000 Received: from localhost ([127.0.0.1]:42748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmI-0008Ho-T4 for submit@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:39 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:54772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmC-0008HK-Ug for 56882@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:38 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by andre.telenet-ops.be with bizsmtp id 2cDX2800520ykKC01cDXHe; Tue, 02 Aug 2022 14:13:31 +0200 From: Maxime Devos To: 56882@debbugs.gnu.org Subject: [PATCH 3/4] perl-file-mimeinfo: Fix cross-compilation. Date: Tue, 2 Aug 2022 14:13:28 +0200 Message-Id: <20220802121329.22276-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220802121329.22276-1-maximedevos@telenet.be> References: <20220802121329.22276-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1659442411; bh=92QJnfqbxMRww2MZ94XAC9Q9D6pk36roTud9rtSamnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BiJAxzOzE1LeDdIylEk50jo2ifHv/L1IW7EHjetXbsJd8331xXwEgpyVMOBHc2az6 n5lpCUTUKIQT3IXkVBiqjIpfyC8TvbUzF8WvCBu8nIxozNun8f250w8s6USROZxst2 /voKhwMp9m2+UY1+MMo+ssZT6ICoHqwf0xWcc3p6rBulSrqLpzvBPMUKs8ypQC7oE6 qBNAl/zyB4xWzjjvM0cAdNiPGO9GCp3UdJ2O0O3Wgc3e20xZNjabfzy2Zujb4L+dVP Q1Gtmq8yKeqV0VPSBYNbObdkpua++YVhREpI7V6CkP2zFhuQJcDtg1VeHAeYfsKvTs RPM6NZMuUcbvQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 56882 Cc: Maxime Devos 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 (-) The result of "guix style" was ignored, as it put #~(modify-phases ...) on the same line as #:phases, causing it to go beyond to 80 columns limit. * gnu/packages/freedesktop.scm (perl-file-mimeinfo)[arguments]<#:phases>: Make it a G-exp to avoid messy nested quasiquotation. {wrap-programs}: When cross-compiling, don't use the PELRL5LIB environment variable, instead use 'search-path-as-list'. --- gnu/packages/freedesktop.scm | 37 +++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 577b354f66..2d12567a42 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1946,19 +1946,30 @@ (define-public perl-file-mimeinfo (arguments ;; Some tests fail due to requiring the mimetype of perl files to be ;; text/plain when they are actually application/x-perl. - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-programs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (prog) - (wrap-program (string-append out "/bin/" prog) - `("PERL5LIB" ":" prefix - (,(string-append (getenv "PERL5LIB") ":" out - "/lib/perl5/site_perl"))))) - '("mimeopen" "mimetype"))) - #t))))) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-programs + ;; TODO(staging): Make unconditional. + (lambda* (#:key #$@(if (%current-target-system) + #~(inputs) + #~()) outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (prog) + (wrap-program (string-append out "/bin/" prog) + `("PERL5LIB" ":" prefix + ;; PERL5LIB looks in 'native-inputs', not 'inputs', + ;; whereas the latter is required for + ;; cross-compilation. + #$(if (%current-target-system) + #~,(search-path-as-list + '("lib/perl5/site_perl") + (map cdr (append inputs outputs))) + #~(,(string-append (getenv "PERL5LIB") ":" out + "/lib/perl5/site_perl")))))) + '("mimeopen" "mimetype"))) + #t))))) (home-page "https://metacpan.org/release/File-MimeInfo") (synopsis "Determine file type from the file name") (description -- 2.37.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 02 08:13:39 2022 Received: (at 56882) by debbugs.gnu.org; 2 Aug 2022 12:13:39 +0000 Received: from localhost ([127.0.0.1]:42750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmJ-0008Hv-8e for submit@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:39 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:54778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmC-0008HL-Ul for 56882@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:38 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by andre.telenet-ops.be with bizsmtp id 2cDX2800520ykKC01cDXHh; Tue, 02 Aug 2022 14:13:32 +0200 From: Maxime Devos To: 56882@debbugs.gnu.org Subject: [PATCH 4/4] xdg-utils: Support cross-compilation. Date: Tue, 2 Aug 2022 14:13:29 +0200 Message-Id: <20220802121329.22276-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220802121329.22276-1-maximedevos@telenet.be> References: <20220802121329.22276-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1659442412; bh=uLzfTY26V+BkB6bV1no9PanrbiO3+t8XiKbzq4cSmJs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AtihJ1pYuQhiANyLK8gylzA4Y6tx0DgEurBFjsDJf5707ciIZHQqo5FCaN7nY662q WFfdKBIi4jdLmkTjhDJ/tLmMkugyM3G4MU6B2hKqPQp0xF7MJbhYS0vP9c4RRI+9/B 1onQnFcBUCuddchLw3T5J4V6GtzLt7s8ozzaOhlEdxsK4roJmDDAX/YfZUZHR02Y0f f/EAR5F0h7JhGrBrKhWFjdhPAzjLSUABV8hJIBV3u4g+H6dsWOFmymgQyhoGBe0Aht V3+AUY/85GxS9NcxyN+5c5FQJ5f7sBpmZ2rLCb594RGog3VdarNiiBW97ukI9dawQB HHuq/6mQlO2QQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 56882 Cc: Maxime Devos 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 (-) "guix style" does not support with-directory-excursion yet, leading to too much spacing, so I have ignored its results. It has been verified that this does not cause rebuilds when compiling natively. The references graph when cross-compiling has also been verified -- glibc-2.33 and the native bash-static-5.1.8 still remains in the graph, but via the cross-compiled inetutils-2.0, ncurses-6.2.20210619 and via gcc-cross-TARGET-10.3.0-lib, which is not related with Perl cross-compilation. * gnu/packages/freedesktop.scm (xdg-utils)[inputs]{bash-minimal,file}: New inputs when cross-compiling. (xdg-utils)[arguments]<#:phases>{locate-catalog-files}: Add 'native-inputs' argument when cross-compiling. Look for docbook-xml and docbook-xsl in native-inputs when cross-compiling. While we are at it, eliminate input labels with search-input-file. (xdg-utils)[arguments]<#:phases>{patch-hardcoded-patch}: Use search-input-file + inputs instead of 'which' when cross-compiling. --- gnu/packages/freedesktop.scm | 58 ++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 2d12567a42..1c984ebca8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2021 pineapples ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Robby Zambito -;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021, 2022 Maxime Devos ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2021, 2021 Maxim Cournoyer ;;; Copyright © 2022 Daniel Meißner @@ -76,6 +76,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages file) #:use-module (gnu packages fontutils) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) @@ -414,7 +415,15 @@ (define-public xdg-utils (list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto)) (inputs `(("awk" ,gawk) + ;; TODO(staging): Make this unconditional, to avoid canonical packages, + ;; see . + ,@(if (%current-target-system) + `(("bash-minimal" ,bash-minimal)) ; for 'wrap-program' + '()) ("coreutils" ,coreutils) + ,@(if (%current-target-system) + `(("file" ,file)) + '()) ("grep" ,grep) ("inetutils" ,inetutils) ; xdg-screensaver uses `hostname' ("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback @@ -428,19 +437,41 @@ (define-public xdg-utils #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths - (lambda _ - (substitute* "scripts/xdg-mime.in" - (("/usr/bin/file") (which "file"))) - (substitute* "scripts/xdg-open.in" - (("/usr/bin/printf") (which "printf"))) - #t)) + ;; TODO(staging): make unconditional + (,@(if (%current-target-system) + '(lambda* (#:key inputs #:allow-other-keys)) + '(lambda _)) + (substitute* "scripts/xdg-mime.in" + (("/usr/bin/file") + (,@(if (%current-target-system) + '(search-input-file inputs "bin/file") + '(which "file"))))) + (substitute* "scripts/xdg-open.in" + (("/usr/bin/printf") + (,@(if (%current-target-system) + '(search-input-file inputs "bin/printf") + '(which "printf"))))) + #t)) (add-before 'build 'locate-catalog-files - (lambda* (#:key inputs #:allow-other-keys) - (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook")) - (xsldoc (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)))) + ;; TODO(staging): Make unconditional for simplicity. + (lambda* (#:key inputs ,@(if (%current-target-system) + '(native-inputs) + '()) #:allow-other-keys) + ;; TODO(staging): Make unconditional for simplicity and + ;; to avoid dependning on input labels. + (let ,(if (%current-target-system) + `((native-inputs (or native-inputs inputs)) + (xmldoc (search-input-directory native-inputs + "xml/dtd/docbook")) + (xsldoc (search-input-directory + native-inputs + (string-append "xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl))))) + `((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook")) + (xsldoc (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl))))) (for-each (lambda (file) (substitute* file (("http://.*/docbookx\\.dtd") @@ -456,6 +487,7 @@ (define-public xdg-utils "/manpages/docbook.xsl man"))) (setenv "STYLESHEET" (string-append xsldoc "/html/docbook.xsl")) + ;; TODO(staging): Might as well remove the #t while we are at it. #t))) (add-after 'install 'wrap-executables (lambda* (#:key inputs outputs #:allow-other-keys) -- 2.37.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 02 08:13:45 2022 Received: (at 56882) by debbugs.gnu.org; 2 Aug 2022 12:13:45 +0000 Received: from localhost ([127.0.0.1]:42752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmO-0008IH-TY for submit@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:45 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:54766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmC-0008HJ-UW for 56882@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by andre.telenet-ops.be with bizsmtp id 2cDX2800520ykKC01cDXHc; Tue, 02 Aug 2022 14:13:31 +0200 From: Maxime Devos To: 56882@debbugs.gnu.org Subject: [PATCH 2/4] gnu: freedesktop: Add 'bash' input for 'wrap-program' Date: Tue, 2 Aug 2022 14:13:27 +0200 Message-Id: <20220802121329.22276-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220802121329.22276-1-maximedevos@telenet.be> References: <20220802121329.22276-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1659442411; bh=3iNlO7n2Jmk2lnUdUUMu8vve5ElfmGhWvUBSU+LzUps=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ga9vJSqmY953j1Vm267R/3am/i7sgcb+kfdzMDprsX63qD4J8svxDMMLnpGty7Vtg Tr0kQhysbWZV6zU4Gr0W1GYG3WKktLs++gkLDE0WRJU3XRK1GFYGTst3awB8mlE0jH 8Lmy7nXiXB/mv6XjtMyRT0Q+OGAyw1Mduky15OoVJV/eEZ2+KpmGziH197don0VYlh 3qVxIepVpWaHSHijGzdoK1Mo0vj5kI+ODeiw9h84eeg8Vv2ANbN2fCv5TIDpRmCHJh +Edw8ugcDfBIVmMHSwyp5Z5KChBtmx1c7ttMvIZgRUShD5JVLjGOLvVVu/PDYEEmby o0hI8ajmYV8fA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 56882 Cc: Maxime Devos 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 (-) It is required for cross-compilation. Cherry-picked from . * gnu/packages/freedesktop.scm (udisks)[inputs]: Add 'bash-minimal' when cross-compiling. (perl-file-mimeinfo)[inputs]: Likewise. (udiskie)[inputs]: Likewise. --- gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4d06235771..577b354f66 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1319,13 +1319,17 @@ (define-public udisks (propagated-inputs (list glib)) ; required by udisks2.pc (inputs - (list acl - cryptsetup - libatasmart - libblockdev - libgudev - polkit - util-linux)) + `(,acl + ;; TODO(staging): Make unconditional. + ,@(if (%current-target-system) + (list bash-minimal) ; for wrap-program + '()) + ,cryptsetup + ,libatasmart + ,libblockdev + ,libgudev + ,polkit + ,util-linux)) (outputs '("out" "doc")) ;5 MiB of gtk-doc HTML (arguments @@ -1930,6 +1934,11 @@ (define-public perl-file-mimeinfo (base32 "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi")))) (build-system perl-build-system) + (inputs + ;; TODO(staging): Make unconditional. + (if (%current-target-system) + (list bash-minimal) ; for wrap-program + '())) ;; If the tests are fixed, add perl-test-pod, perl-test-pod-coverage, and ;; perl-test-tiny as native-inputs. (propagated-inputs @@ -2026,7 +2035,15 @@ (define-public udiskie ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection))) (inputs - (list gobject-introspection gtk+ libappindicator libnotify udisks)) + ;; TODO(staging): Make unconditional. + `(,@(if (%current-target-system) + (list bash-minimal) + '()) + ,gobject-introspection + ,gtk+ + ,libappindicator + ,libnotify + ,udisks)) (propagated-inputs (list python-docopt python-pygobject python-keyutils python-pyxdg python-pyyaml)) -- 2.37.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 06 12:25:57 2022 Received: (at 56882-done) by debbugs.gnu.org; 6 Aug 2022 16:25:57 +0000 Received: from localhost ([127.0.0.1]:35333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKMcf-00077p-Bc for submit@debbugs.gnu.org; Sat, 06 Aug 2022 12:25:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKMcb-00077a-JX for 56882-done@debbugs.gnu.org; Sat, 06 Aug 2022 12:25:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKMcV-00020f-C7; Sat, 06 Aug 2022 12:25:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=mCTXrwP+5iVFiC5eWKPAj5BMqkjHbXSHrX4fhx5S9UE=; b=Objh+LQodFYRl6yA4Rk3 KU9HqS2X59Xl19437LcgJq9sS8DLGdbR0MK2YnKmvVQqNihbohx9gsu07rAxkB2yMTp3/3TJvfCk4 iWfSlTiT8kVRypAT64eXZkvYfeAGpG02ovYJFFtNfUO8X1jnR2oIex+aBjA8EWbAswuaZq5jy+MQs nZUYfTEjgxAdB8Pf2eMlmRjYjU8H4zjVkrGatx5zo/5ejOQo4sOQxE9RopWoXBNNYEfZhkF8L+pqj JGk2ro1Qo5cKIaRBYyWNJeGIJGDwBpI1CBDcLZfNGL6spLuc57i54ORW094GGM+FmfIv+lKpMjojF PE22bd4kTcGASw==; Received: from 2a02-8429-81d2-3d01-94c9-8097-ea5c-2774.rev.sfr.net ([2a02:8429:81d2:3d01:94c9:8097:ea5c:2774]:52990 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKMcQ-0004Jq-QA; Sat, 06 Aug 2022 12:25:47 -0400 From: Mathieu Othacehe To: Maxime Devos Subject: Re: bug#56882: [PATCH 0/4] build-system/perl: Support some cross-compilation, and test with xdg-utils References: <8d9f6385-f835-e082-9b2c-730b311c2eca@telenet.be> Date: Sat, 06 Aug 2022 18:25:39 +0200 In-Reply-To: <8d9f6385-f835-e082-9b2c-730b311c2eca@telenet.be> (Maxime Devos's message of "Tue, 2 Aug 2022 13:54:18 +0200") Message-ID: <87tu6pz6d8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56882-done Cc: 56882-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: -3.3 (---) Hello Maxime, > Supporting cross-compilation of xdg-utils opens the way to trying > cross-compilation of Qt things. > > Things like XS are unsupported -- going by > https://arsv.github.io/perl-cross/modules.html and the web page that states > that external modules need to be copied into Perl first (but which I cannot > find anymore), it sounds rather complicated. At least that's a very good start :) I fixed some long lines before pushing. Thanks, Mathieu From unknown Wed Jun 25 02:11:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 04 Sep 2022 11:24:09 +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