me
/
guix
Archived
1
0
Fork 0
Code

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.
Ludovic Courtès 2023-03-04 16:04:36 +01:00
parent cfda54c12f
commit 0b4837a95b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/packages/commencement.scm
View File

@ -3034,6 +3034,7 @@ memoized as a function of '%current-system'."
("flex" ,flex-boot0))) ("flex" ,flex-boot0)))
(inputs `(("flex" ,flex-boot0))) (inputs `(("flex" ,flex-boot0)))
(arguments (arguments
;; TODO: On next rebuild cycle, reuse phases from 'mig'.
`(#:configure-flags `(#:configure-flags
`(,(string-append "LDFLAGS=-Wl,-rpath=" `(,(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %build-inputs "flex") "/lib/"))))))) (assoc-ref %build-inputs "flex") "/lib/")))))))

15
gnu/packages/hurd.scm
View File

@ -122,19 +122,20 @@ GNU/Hurd."
"1gyda8sq6b379nx01hkpbd85lz39irdvz2b9wbr63gicicx8i706")))) "1gyda8sq6b379nx01hkpbd85lz39irdvz2b9wbr63gicicx8i706"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; Flex is needed both at build and run time. ;; Flex is needed both at build and run time.
(inputs (list gnumach-headers flex perl)) (inputs (list gnumach-headers flex))
(native-inputs (native-inputs (list flex bison))
(list flex bison))
(arguments (arguments
(list #:tests? #f (list #:tests? #f
#:phases #:phases
#~(modify-phases %standard-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) (lambda* (#:key build inputs outputs #:allow-other-keys)
(let ((perl (assoc-ref inputs "perl")) (let ((out (assoc-ref outputs "out")))
(out (assoc-ref outputs "out"))) ;; By default 'mig' uses Perl to compute
;; 'libexecdir_rel'. Avoid it.
(substitute* (string-append out "/bin/mig") (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") (home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html")
(synopsis "Mach 3.0 interface generator for the Hurd") (synopsis "Mach 3.0 interface generator for the Hurd")
(description (description