[bug#40698] [core-updates]: [PATCH v2] gnu: perl: Actually produce a host perl when cross-compiling.

[Marius Bakke]

Jan Nieuwenhuizen <address@hidden> writes:

> 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.

Wooow, awesome work (as usual)!

Some feedback on the patch:

> From b10ca56254cd1b1f8ec4b222ad27cb02ce59316c Mon Sep 17 00:00:00 2001
> From: "Jan (janneke) Nieuwenhuizen" <address@hidden>
> Date: Sat, 18 Apr 2020 17:05:48 +0200
> Subject: [PATCH] gnu: perl: Actually produce a host perl when cross-compiling.
>
> * 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(-)

[...]

> @@ -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

It might be clearer to add "TODO: use coreutils from INPUTS instead of
'which'" here, maybe mentioning the related substitution below.

>               ;; Build in GNU89 mode to tolerate C++-style comment in libc's
>               ;; <bits/string3.h>.
> @@ -120,10 +123,84 @@
>                 (("-std=c89")
>                  "-std=gnu89"))
>               #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" ".")

Please use 'make-file-writable' instead of chmod.

> +                       (copy-recursively cross-checkout "."))
> +                     (let ((bash (assoc-ref %build-inputs "bash")))

Use the scoped 'inputs' instead of the magical %build-inputs.

> +                       (substitute* '("Makefile.config.SH"
> +                                      "cnf/config.guess"
> +                                      "cnf/config.sub"
> +                                      "cnf/configure"
> +                                      "cnf/configure_misc.sh"
> +                                      "miniperl_top")
> +                         (("! */bin/sh") (string-append "! " bash 
> "/bin/bash"))
> +                         ((" /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")))

Should $cpp not be replaced with 'g++'?

> +                     #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=" 
> ,(%current-target-system))
> +                              (string-append "--prefix=" out)
> +                              "-Dbyteorder=1234"
> +                              (filter (negate
> +                                       (lambda (x) (or (string-prefix? "-d" 
> x)
> +                                                       (string-prefix? 
> "-Dcc=" x))))
> +                                      configure-flags)))
> +                            (bash (assoc-ref inputs "bash"))
> +                            (coreutils (assoc-ref inputs "coreutils")))
> +                       (format (current-error-port)
> +                               "running ./configure ~a\n" (string-join 
> configure-flags))
> +                       (apply invoke (cons "./configure" configure-flags))
> +                       (substitute* "config.sh"
> +                         (("^libs=.*") "libs='-ldl -lpthread -lm'\n")
> +                         (("^perllibs=.*") "perllibs='-ldl -lpthread -lm'\n")
> +                         (("/gnu/store/[^/]*-bash-[^/]*") bash))

This phase should add a let binding for (%store-directory) and refer to
that instead of the literal /gnu/store strings (see e.g. 'git').

> +                       (substitute* '("config.h")
> +                         (("^#define OSNAME .*")
> +                          (string-append "#define OSNAME \""
> +                                         ,(if (hurd-target?) "GNU" "Linux")

Would it make sense to upstream this?

> +                                         "\"\n"))
> +                         (("^# HAS_NANOSLEEP") "/* #undef HAS_NANOSLEEP */")

Is this substitution required on all cross-compilation targets?

> +                         (("^#define SH_PATH .*")
> +                          (string-append  "#define SH_PATH \"" bash 
> "/bin/bash\"\n")))
> +                       ;;TODO: fix this in setup-configure next rebuild cycle
> +                       (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 
> built...
> +                     (mkdir-p "cpan/Pod-Usage/blib/script")
> +                     (with-output-to-file 
> "cpan/Pod-Usage/blib/script/pod2text"
> +                       (lambda _ (display "")))
> +                     (with-output-to-file 
> "cpan/Pod-Usage/blib/script/pod2usage"
> +                       (lambda _ (display "")))
> +                     (with-output-to-file 
> "cpan/Pod-Checker/blib/script/podchecker"
> +                       (lambda _ (display "")))
> +                     (mkdir-p "cpan/Pod-Parser/blib/script")
> +                     (with-output-to-file 
> "cpan/Pod-Parser/blib/script/podselect"
> +                       (lambda _ (display "")))

Using '(call-with-output-file "foo" (const #t))' is clearer IMO.  Also
consider using 'for-each' here.

Phew!  Thanks a lot for this, LGTM!

> +                     #t)))
> +               `((replace 'configure
> +                   (lambda* (#:key configure-flags #:allow-other-keys)
> +                     (format #t "Perl configure flags: ~s~%" configure-flags)
> +                     (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 
> "065qbl1x44maykaj8p8za0b6qxj74bz7fi2zsrlydir1mqb1js3d")))))
> +         '()))
>      (native-search-paths (list (search-path-specification
>                                  (variable "PERL5LIB")
>                                  (files '("lib/perl5/site_perl")))))
> -- 
> 2.26.0
>
>
> -- 
> Jan Nieuwenhuizen <address@hidden> | GNU LilyPond http://lilypond.org
> Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

signature.asc
Description: PGP signature