From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:40198) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQ5kB-0006z0-Ez for guix-patches@gnu.org; Sun, 19 Apr 2020 04:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQ5kA-0004Rb-I8 for guix-patches@gnu.org; Sun, 19 Apr 2020 04:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQ5kA-0004RN-5A for guix-patches@gnu.org; Sun, 19 Apr 2020 04:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQ5kA-0005ck-3y for guix-patches@gnu.org; Sun, 19 Apr 2020 04:56:02 -0400 Subject: [bug#40698] [core-updates]: [PATCH v2] gnu: perl: Actually produce a host perl when cross-compiling. Resent-Message-ID: From: Jan Nieuwenhuizen References: <87r1wku54w.fsf@gnu.org> Date: Sun, 19 Apr 2020 10:54:58 +0200 In-Reply-To: <87r1wku54w.fsf@gnu.org> (Jan Nieuwenhuizen's message of "Sat, 18 Apr 2020 18:31:59 +0200") Message-ID: <87lfmrua71.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40698@debbugs.gnu.org Cc: Marius Bakke --=-=-= Content-Type: text/plain Jan Nieuwenhuizen writes: > As discussed on IRC, I tried to apply perl-cross > (https://github.com/arsv/perl-cross) to make perl actually cross build > for our Hurd VM. Find an improved patch below. It fixes > Can't exec "": No such file or directory at /gnu/store/dd5a35aca6411w5l29ask7pl626v8j4r-perl-5.30.2/lib/perl5/5.30.2/i586-/Cwd.pm line 204. > Can't exec "": No such file or directory at /gnu/store/mfnmg1m37kyrb65alnj6jn2fzw7zkapw-autoconf-cross-2.69/share/autoconf/Autom4te/FileUtils.pm line 345. which was due to having #define SH_PATH "" in config.h. It also fixes "cwd" in perl, that was caused by this (substitute* "dist/PathTools/Cwd.pm" (("/bin/pwd") - (which "pwd"))) + (which "pwd"))) ;TODO: fix cross-compile next rebuild cycle and now fixed lateron + ;;TODO: fix this in setup-configure next rebuild cycle + (substitute* "dist/PathTools/Cwd.pm" + (("/gnu/store/[^/]*-coreutils-[^/]*") coreutils)) Using this, I can cross-build perl and which allows me to ceate patches to cross build, autoconf and automake that work to configure Guix git on the Hurd. Greetings, janneke --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-perl-Actually-produce-a-host-perl-when-cross-com.patch Content-Transfer-Encoding: quoted-printable >From b10ca56254cd1b1f8ec4b222ad27cb02ce59316c Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 18 Apr 2020 17:05:48 +0200 Subject: [PATCH] gnu: perl: Actually produce a host perl when cross-compili= ng. * gnu/packages/perl.scm (perl)[native-inputs]: When cross-compiling, add `perl-cross' input. [arguments]: When cross-compiling, use it to produce binary for host. --- gnu/packages/perl.scm | 106 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 6 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d6a75506ec..c8332ecead 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -11,7 +11,7 @@ ;;; Copyright =C2=A9 2016 Alex Sassmannshausen ;;; Copyright =C2=A9 2016, 2018, 2020 Roel Janssen ;;; Copyright =C2=A9 2016 Ben Woodcroft -;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen +;;; Copyright =C2=A9 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright =C2=A9 2017 Raoul J.P. Bonnal ;;; Copyright =C2=A9 2017, 2018 Marius Bakke ;;; Copyright =C2=A9 2017 Adriano Peluso @@ -48,14 +48,17 @@ #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gd) + #:use-module (gnu packages hurd) #:use-module (gnu packages less) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl-check) @@ -112,7 +115,7 @@ ;; Use the right path for `pwd'. (substitute* "dist/PathTools/Cwd.pm" (("/bin/pwd") - (which "pwd"))) + (which "pwd"))) ;TODO: fix cross-compile next rebuild cycle =20 ;; Build in GNU89 mode to tolerate C++-style comment in libc's ;; . @@ -120,10 +123,84 @@ (("-std=3Dc89") "-std=3Dgnu89")) #t)) - (replace 'configure - (lambda* (#:key configure-flags #:allow-other-keys) - (format #t "Perl configure flags: ~s~%" configure-flags) - (apply invoke "./Configure" configure-flags))) + ,@(if (%current-target-system) + `((add-after 'unpack 'unpack-cross + (lambda* (#:key inputs #:allow-other-keys) + (let ((cross-checkout (assoc-ref %build-inputs "perl-= cross"))) + (invoke "chmod" "-R" "+w" ".") + (copy-recursively cross-checkout ".")) + (let ((bash (assoc-ref %build-inputs "bash"))) + (substitute* '("Makefile.config.SH" + "cnf/config.guess" + "cnf/config.sub" + "cnf/configure" + "cnf/configure_misc.sh" + "miniperl_top") + (("! */bin/sh") (string-append "! " bash "/bin/ba= sh")) + ((" /bin/sh") (string-append bash "/bin/bash"))) + (substitute* '("cnf/configure_tool.sh") + (( "[\t ]*result \"BSD\".*") + "\ + result \"BSD\" + ;; + *-gnu) + result \"GNU\" +")) + (substitute* '("ext/Errno/Errno_pm.PL") + (( "\\$cpp < errno.c") "gcc -E errno.c"))) + #t)) + (replace 'configure + (lambda* (#:key configure-flags outputs inputs #:allow-= other-keys) + (let* ((out (assoc-ref outputs "out")) + (configure-flags + (cons* + ;; `perl-cross' confuses target and host + (string-append "--target=3D" ,(%current-targ= et-system)) + (string-append "--prefix=3D" out) + "-Dbyteorder=3D1234" + (filter (negate + (lambda (x) (or (string-prefix? "-d= " x) + (string-prefix? "-D= cc=3D" x)))) + configure-flags))) + (bash (assoc-ref inputs "bash")) + (coreutils (assoc-ref inputs "coreutils"))) + (format (current-error-port) + "running ./configure ~a\n" (string-join con= figure-flags)) + (apply invoke (cons "./configure" configure-flags)) + (substitute* "config.sh" + (("^libs=3D.*") "libs=3D'-ldl -lpthread -lm'\n") + (("^perllibs=3D.*") "perllibs=3D'-ldl -lpthread -= lm'\n") + (("/gnu/store/[^/]*-bash-[^/]*") bash)) + (substitute* '("config.h") + (("^#define OSNAME .*") + (string-append "#define OSNAME \"" + ,(if (hurd-target?) "GNU" "Linux") + "\"\n")) + (("^# HAS_NANOSLEEP") "/* #undef HAS_NANOSLEEP */= ") + (("^#define SH_PATH .*") + (string-append "#define SH_PATH \"" bash "/bin/= bash\"\n"))) + ;;TODO: fix this in setup-configure next rebuild cy= cle + (substitute* "dist/PathTools/Cwd.pm" + (("/gnu/store/[^/]*-coreutils-[^/]*") coreutils)) + #t))) + (add-after 'build 'touch-non-built-files-for-install + (lambda _ + ;; `make install' wants to install this; it wasn't bu= ilt... + (mkdir-p "cpan/Pod-Usage/blib/script") + (with-output-to-file "cpan/Pod-Usage/blib/script/pod2= text" + (lambda _ (display ""))) + (with-output-to-file "cpan/Pod-Usage/blib/script/pod2= usage" + (lambda _ (display ""))) + (with-output-to-file "cpan/Pod-Checker/blib/script/po= dchecker" + (lambda _ (display ""))) + (mkdir-p "cpan/Pod-Parser/blib/script") + (with-output-to-file "cpan/Pod-Parser/blib/script/pod= select" + (lambda _ (display ""))) + #t))) + `((replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (format #t "Perl configure flags: ~s~%" configure-fla= gs) + (apply invoke "./Configure" configure-flags))))) (add-after 'install 'remove-extra-references (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -152,6 +229,23 @@ "/lib',\n")))) config2) #t)))))) + (inputs + (if (%current-target-system) + `(("bash" ,bash-minimal) + ("coreutils" ,coreutils)) + '())) + (native-inputs + (if (%current-target-system) + `(("perl-cross" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arsv/perl-cross") + (commit "1.3.3"))) + (file-name (git-file-name "perl-cross" "1.3.3")) + (sha256 + (base32 "065qbl1x44maykaj8p8za0b6qxj74bz7fi2zsrlydir1mqb1j= s3d"))))) + '())) (native-search-paths (list (search-path-specification (variable "PERL5LIB") (files '("lib/perl5/site_perl"))))) --=20 2.26.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com --=-=-=--