diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/commencement.scm | 1 | ||||
| -rw-r--r-- | 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 |