gnu: perl: Actually produce a host perl when cross-compiling.
* gnu/packages/patches/perl-cross.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/perl.scm (perl)[native-inputs]: When cross-compiling, add `perl-cross' input and perl-cross.patch. [arguments]: When cross-compiling, use them to produce binary for host.
This commit is contained in:
Jan (janneke) Nieuwenhuizen
Jan Nieuwenhuizen
parent
48acdefe2e
commit
eaff60b35f
|
|
@ -1318,6 +1318,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/patchutils-test-perms.patch \
|
||||
%D%/packages/patches/patch-hurd-path-max.patch \
|
||||
%D%/packages/patches/perl-autosplit-default-time.patch \
|
||||
%D%/packages/patches/perl-cross.patch \
|
||||
%D%/packages/patches/perl-deterministic-ordering.patch \
|
||||
%D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
|
||||
%D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
|
||||
|
|
|
|||
60
gnu/packages/patches/perl-cross.patch
Normal file
60
gnu/packages/patches/perl-cross.patch
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
Submitted upstream.
|
||||
|
||||
From 4c3eb19a11dfe5c88c902481a8294c4f675fcd03 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
|
||||
Date: Sun, 19 Apr 2020 23:33:28 +0200
|
||||
Subject: [PATCH] Support cross-compiling to the Hurd.
|
||||
|
||||
* cnf/hints/gnu: New file.
|
||||
* cnf/configure_tool.sh: Guess it.
|
||||
---
|
||||
cnf/configure_tool.sh | 4 ++++
|
||||
cnf/hints/gnu | 21 +++++++++++++++++++++
|
||||
2 files changed, 25 insertions(+)
|
||||
create mode 100644 cnf/hints/gnu
|
||||
|
||||
diff --git a/cnf/configure_tool.sh b/cnf/configure_tool.sh
|
||||
index 32201c0..7b0baa4 100644
|
||||
--- a/cnf/configure_tool.sh
|
||||
+++ b/cnf/configure_tool.sh
|
||||
@@ -266,6 +266,10 @@ if not hinted 'osname'; then
|
||||
define osname "bsd"
|
||||
result "BSD"
|
||||
;;
|
||||
+ *-gnu*)
|
||||
+ define osname "gnu"
|
||||
+ result "GNU"
|
||||
+ ;;
|
||||
*)
|
||||
result "no"
|
||||
;;
|
||||
diff --git a/cnf/hints/gnu b/cnf/hints/gnu
|
||||
new file mode 100644
|
||||
index 0000000..a0583a2
|
||||
--- /dev/null
|
||||
+++ b/cnf/hints/gnu
|
||||
@@ -0,0 +1,21 @@
|
||||
+# Hurd syscalls
|
||||
+d_voidsig='define'
|
||||
+d_nanosleep='undef'
|
||||
+d_clock_gettime='define'
|
||||
+d_clock_getres='define'
|
||||
+d_clock_nanosleep='define'
|
||||
+d_clock='define'
|
||||
+
|
||||
+# From the original linux.sh
|
||||
+usemallocwrap='define'
|
||||
+
|
||||
+# libraries to test
|
||||
+libswanted='m crypt pthread nm ndbm gdbm dbm db dl gdbm_compat'
|
||||
+
|
||||
+d_procselfexe='undef'
|
||||
+procselfexe='"undef"'
|
||||
+
|
||||
+st_ino_sign=1
|
||||
+st_ino_size=8
|
||||
+
|
||||
+d_fcntl_can_lock='define'
|
||||
--
|
||||
2.26.0
|
||||
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
|
||||
;;; Copyright © 2016, 2018, 2020 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2017 Raoul J.P. Bonnal <ilpuccio.febo@gmail.com>
|
||||
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
|
||||
|
|
@ -48,14 +48,17 @@ (define-module (gnu packages perl)
|
|||
#: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)
|
||||
|
|
@ -110,6 +113,8 @@ (define-public perl
|
|||
(add-before 'configure 'setup-configure
|
||||
(lambda _
|
||||
;; Use the right path for `pwd'.
|
||||
;; TODO: use coreutils from INPUTS instead of 'which'
|
||||
;; in next rebuild cycle, see fixup below.
|
||||
(substitute* "dist/PathTools/Cwd.pm"
|
||||
(("/bin/pwd")
|
||||
(which "pwd")))
|
||||
|
|
@ -120,10 +125,80 @@ (define-public perl
|
|||
(("-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 native-inputs inputs #:allow-other-keys)
|
||||
(let ((cross-checkout
|
||||
(assoc-ref native-inputs "perl-cross"))
|
||||
(cross-patch
|
||||
(assoc-ref native-inputs "perl-cross-patch")))
|
||||
(rename-file "Artistic" "Artistic.perl")
|
||||
(rename-file "Copying" "Copying.perl")
|
||||
(copy-recursively cross-checkout ".")
|
||||
(format #t "Applying ~a\n" cross-patch)
|
||||
(invoke "patch" "-p1" "-i" cross-patch))
|
||||
(let ((bash (assoc-ref 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* '("ext/Errno/Errno_pm.PL")
|
||||
(("\\$cpp < errno.c") "$Config{cc} -E errno.c")))
|
||||
#t))
|
||||
(replace 'configure
|
||||
(lambda* (#:key configure-flags outputs inputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(store-directory (%store-directory))
|
||||
(configure-flags
|
||||
(cons*
|
||||
;; `perl-cross' confuses target and host
|
||||
(string-append "--target=" ,(%current-target-system))
|
||||
(string-append "--prefix=" out)
|
||||
(string-append "-Dcc=" ,(%current-target-system) "-gcc")
|
||||
"-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"
|
||||
(((string-append store-directory "/[^/]*-bash-[^/]*"))
|
||||
bash))
|
||||
(substitute* '("config.h")
|
||||
(("^#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"
|
||||
(((string-append store-directory "/[^/]*-coreutils-[^/]*"))
|
||||
coreutils))
|
||||
#t)))
|
||||
(add-after 'build 'touch-non-built-files-for-install
|
||||
(lambda _
|
||||
;; `make install' wants to install these although they do
|
||||
;; not get built...
|
||||
(with-directory-excursion "cpan"
|
||||
(mkdir-p "Pod-Usage/blib/script")
|
||||
(mkdir-p "Pod-Parser/blib/script")
|
||||
(for-each (lambda (file)
|
||||
(call-with-output-file file
|
||||
(lambda (port) (display "" port))))
|
||||
'("Pod-Usage/blib/script/pod2text"
|
||||
"Pod-Usage/blib/script/pod2usage"
|
||||
"Pod-Checker/blib/script/podchecker"
|
||||
"Pod-Parser/blib/script/podselect")))
|
||||
#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 +227,24 @@ (define-public perl
|
|||
"/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"))))
|
||||
("perl-cross-patch" ,@(search-patches "perl-cross.patch")))
|
||||
'()))
|
||||
(native-search-paths (list (search-path-specification
|
||||
(variable "PERL5LIB")
|
||||
(files '("lib/perl5/site_perl")))))
|
||||
|
|
|
|||
Loading…
Reference in a new issue