From patchwork Sat Apr 18 16:31:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 21350 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1B36D27BBE4; Sat, 18 Apr 2020 17:33:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id F261927BBE1 for ; Sat, 18 Apr 2020 17:33:13 +0100 (BST) Received: from localhost ([::1]:59878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPqP3-0006bF-Gu for patchwork@mira.cbaines.net; Sat, 18 Apr 2020 12:33:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51366) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPqOu-0006YT-BM for guix-patches@gnu.org; Sat, 18 Apr 2020 12:33:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPqOs-0005ow-M3 for guix-patches@gnu.org; Sat, 18 Apr 2020 12:33:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPqOs-0005oR-IC for guix-patches@gnu.org; Sat, 18 Apr 2020 12:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jPqOs-0005fD-8g for guix-patches@gnu.org; Sat, 18 Apr 2020 12:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40698] [core-updates]: [PATCH] gnu: perl: Actually produce a host perl when cross-compiling. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Apr 2020 16:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40698 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40698@debbugs.gnu.org Cc: Marius Bakke X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158722754421718 (code B ref -1); Sat, 18 Apr 2020 16:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Apr 2020 16:32:24 +0000 Received: from localhost ([127.0.0.1]:43483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPqO7-0005e3-40 for submit@debbugs.gnu.org; Sat, 18 Apr 2020 12:32:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:44003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPqNy-0005dp-Tj for submit@debbugs.gnu.org; Sat, 18 Apr 2020 12:32:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51177) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPqNw-0005T8-VZ for guix-patches@gnu.org; Sat, 18 Apr 2020 12:32:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jPqNv-0003aH-Ua; Sat, 18 Apr 2020 12:32:04 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=41628 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jPqNv-00085V-7s; Sat, 18 Apr 2020 12:32:03 -0400 From: Jan Nieuwenhuizen Date: Sat, 18 Apr 2020 18:31:59 +0200 Message-ID: <87r1wku54w.fsf@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi! 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. There's some weirdness wrt some pod scripts; no idea. I haven't gotten round to test the package itself yet on the Hurd. Also, first tests on the Hurd show a possible problem with Perl's system or shell -- no idea. I get things like 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. to me that's just as cryptic as Perl code itself. I'll have a look into that later tonight. Greetings, janneke From b96825876eea5c0dff9414d88a8dc3302b2d2f7f 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-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 | 85 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 5 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d6a75506ec..67f4cb969c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2018, 2020 Roel Janssen ;;; Copyright © 2016 Ben Woodcroft -;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2017 Raoul J.P. Bonnal ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Adriano Peluso @@ -48,6 +48,7 @@ #: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) @@ -120,10 +121,72 @@ (("-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" ".") + (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/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"))) + #t)) + (replace 'configure + (lambda* (#:key configure-flags outputs #: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)))) + (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")) + (substitute* "config.h" + (("^# HAS_NANOSLEEP") "/* #undef HAS_NANOSLEEP */")) + #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 ""))) + #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 +215,18 @@ "/lib',\n")))) config2) #t)))))) + (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