[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: gnu: mig: Remove dependency on Perl.
From: |
guix-commits |
Subject: |
02/07: gnu: mig: Remove dependency on Perl. |
Date: |
Sat, 4 Mar 2023 12:48:06 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 0b4837a95b255ba18e01b2155ded2c7718bd9181
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Mar 4 16:04:36 2023 +0100
gnu: mig: Remove dependency on Perl.
* gnu/packages/hurd.scm (mig)[inputs]: Remove PERL.
[arguments]: Remove 'patch-non-shebang-references' phase and add
'avoid-perl-dependency' phase.
---
gnu/packages/commencement.scm | 1 +
gnu/packages/hurd.scm | 15 ++++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7335aedec2..ea3a0afc23 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3034,6 +3034,7 @@ memoized as a function of '%current-system'."
("flex" ,flex-boot0)))
(inputs `(("flex" ,flex-boot0)))
(arguments
+ ;; TODO: On next rebuild cycle, reuse phases from 'mig'.
`(#:configure-flags
`(,(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %build-inputs "flex")
"/lib/")))))))
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 2c2cbb95ba..f4de5dc6c2 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -122,19 +122,20 @@ GNU/Hurd."
"1gyda8sq6b379nx01hkpbd85lz39irdvz2b9wbr63gicicx8i706"))))
(build-system gnu-build-system)
;; Flex is needed both at build and run time.
- (inputs (list gnumach-headers flex perl))
- (native-inputs
- (list flex bison))
+ (inputs (list gnumach-headers flex))
+ (native-inputs (list flex bison))
(arguments
(list #:tests? #f
#:phases
#~(modify-phases %standard-phases
- (add-after 'install 'patch-non-shebang-references
+ (add-after 'install 'avoid-perl-dependency
(lambda* (#:key build inputs outputs #:allow-other-keys)
- (let ((perl (assoc-ref inputs "perl"))
- (out (assoc-ref outputs "out")))
+ (let ((out (assoc-ref outputs "out")))
+ ;; By default 'mig' uses Perl to compute
+ ;; 'libexecdir_rel'. Avoid it.
(substitute* (string-append out "/bin/mig")
- (("perl ") (string-append perl "/bin/perl ")))))))))
+ (("^libexecdir_rel=.*")
+ "libexecdir_rel=../libexec\n"))))))))
(home-page
"https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html")
(synopsis "Mach 3.0 interface generator for the Hurd")
(description
- branch master updated (ec9192933c -> 6c68abcc66), guix-commits, 2023/03/04
- 01/07: gnu: mig: Use gexps., guix-commits, 2023/03/04
- 04/07: gnu: cross-base: Inherit arguments from 'mig'., guix-commits, 2023/03/04
- 02/07: gnu: mig: Remove dependency on Perl.,
guix-commits <=
- 03/07: gnu: cross-base: Remove input labels for GNU Mach and MiG., guix-commits, 2023/03/04
- 05/07: gnu: Remove and deprecate tidy for tidy-html, guix-commits, 2023/03/04
- 06/07: gnu: gambit-c: Update gambit-c to 4.9.4., guix-commits, 2023/03/04
- 07/07: gnu: Add guile-gemini., guix-commits, 2023/03/04