* bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase.
@ 2017-03-27 19:38 Arun Isaac
2017-03-28 15:18 ` Marius Bakke
2020-11-16 18:03 ` Jonathan Brielmaier
0 siblings, 2 replies; 9+ messages in thread
From: Arun Isaac @ 2017-03-27 19:38 UTC (permalink / raw)
To: 26275
* guix/build/perl-build-system.scm (wrap): New procedure.
(%standard-phases): Add it.
---
guix/build/perl-build-system.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/guix/build/perl-build-system.scm b/guix/build/perl-build-system.scm
index 8f480eae1..32ef86b65 100644
--- a/guix/build/perl-build-system.scm
+++ b/guix/build/perl-build-system.scm
@@ -19,7 +19,10 @@
(define-module (guix build perl-build-system)
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
#:use-module (guix build utils)
+ #:use-module (ice-9 ftw)
#:use-module (ice-9 match)
+ #:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-26)
#:export (%standard-phases
perl-build))
@@ -68,6 +71,31 @@
(define-w/gnu-fallback* (install)
(zero? (system* "./Build" "install")))
+(define* (wrap #:key inputs outputs #:allow-other-keys)
+ (define (list-of-files dir)
+ (map (cut string-append dir "/" <>)
+ (or (scandir dir (lambda (f)
+ (let ((s (stat (string-append dir "/" f))))
+ (eq? 'regular (stat:type s)))))
+ '())))
+
+ (define bindirs
+ (append-map (match-lambda
+ ((_ . dir)
+ (list (string-append dir "/bin")
+ (string-append dir "/sbin"))))
+ outputs))
+
+ (let* ((out (assoc-ref outputs "out"))
+ (var `("PERL5LIB" prefix
+ ,(search-path-as-string->list
+ (or (getenv "PERL5LIB") "")))))
+ (for-each (lambda (dir)
+ (let ((files (list-of-files dir)))
+ (for-each (cut wrap-program <> var)
+ files)))
+ bindirs)))
+
(define %standard-phases
;; Everything is as with the GNU Build System except for the `configure',
;; `build', `check', and `install' phases.
@@ -75,6 +103,7 @@
(replace 'install install)
(replace 'check check)
(replace 'build build)
+ (add-after 'install 'wrap wrap)
(replace 'configure configure)))
(define* (perl-build #:key inputs (phases %standard-phases)
--
2.11.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase.
2017-03-27 19:38 bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase Arun Isaac
@ 2017-03-28 15:18 ` Marius Bakke
2017-03-28 17:02 ` Arun Isaac
2020-11-16 18:03 ` Jonathan Brielmaier
1 sibling, 1 reply; 9+ messages in thread
From: Marius Bakke @ 2017-03-28 15:18 UTC (permalink / raw)
To: Arun Isaac, 26275
[-- Attachment #1: Type: text/plain, Size: 2669 bytes --]
Hello!
I can't study the code right now, but at a glance it looks like this
will also include native-inputs in PERL5LIB. Can you try to filter them
out?
Doing that will effectively also solve
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25235 . Patch welcome! :)
Arun Isaac <arunisaac@systemreboot.net> writes:
> * guix/build/perl-build-system.scm (wrap): New procedure.
> (%standard-phases): Add it.
> ---
> guix/build/perl-build-system.scm | 29 +++++++++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
>
> diff --git a/guix/build/perl-build-system.scm b/guix/build/perl-build-system.scm
> index 8f480eae1..32ef86b65 100644
> --- a/guix/build/perl-build-system.scm
> +++ b/guix/build/perl-build-system.scm
> @@ -19,7 +19,10 @@
> (define-module (guix build perl-build-system)
> #:use-module ((guix build gnu-build-system) #:prefix gnu:)
> #:use-module (guix build utils)
> + #:use-module (ice-9 ftw)
> #:use-module (ice-9 match)
> + #:use-module (srfi srfi-1)
> + #:use-module (srfi srfi-26)
> #:export (%standard-phases
> perl-build))
>
> @@ -68,6 +71,31 @@
> (define-w/gnu-fallback* (install)
> (zero? (system* "./Build" "install")))
>
> +(define* (wrap #:key inputs outputs #:allow-other-keys)
> + (define (list-of-files dir)
> + (map (cut string-append dir "/" <>)
> + (or (scandir dir (lambda (f)
> + (let ((s (stat (string-append dir "/" f))))
> + (eq? 'regular (stat:type s)))))
> + '())))
> +
> + (define bindirs
> + (append-map (match-lambda
> + ((_ . dir)
> + (list (string-append dir "/bin")
> + (string-append dir "/sbin"))))
> + outputs))
> +
> + (let* ((out (assoc-ref outputs "out"))
> + (var `("PERL5LIB" prefix
> + ,(search-path-as-string->list
> + (or (getenv "PERL5LIB") "")))))
> + (for-each (lambda (dir)
> + (let ((files (list-of-files dir)))
> + (for-each (cut wrap-program <> var)
> + files)))
> + bindirs)))
> +
> (define %standard-phases
> ;; Everything is as with the GNU Build System except for the `configure',
> ;; `build', `check', and `install' phases.
> @@ -75,6 +103,7 @@
> (replace 'install install)
> (replace 'check check)
> (replace 'build build)
> + (add-after 'install 'wrap wrap)
> (replace 'configure configure)))
>
> (define* (perl-build #:key inputs (phases %standard-phases)
> --
> 2.11.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase.
2017-03-28 15:18 ` Marius Bakke
@ 2017-03-28 17:02 ` Arun Isaac
2017-06-02 16:33 ` Ludovic Courtès
0 siblings, 1 reply; 9+ messages in thread
From: Arun Isaac @ 2017-03-28 17:02 UTC (permalink / raw)
To: 26275
> I can't study the code right now, but at a glance it looks like this
> will also include native-inputs in PERL5LIB. Can you try to filter them
> out?
>
> Doing that will effectively also solve
> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25235 . Patch welcome! :)
Yes, I'll do this! :-) I'll first send a patch for bug 25235, we'll
close that, and then come back here.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase.
2017-03-28 17:02 ` Arun Isaac
@ 2017-06-02 16:33 ` Ludovic Courtès
2017-06-02 17:40 ` Arun Isaac
0 siblings, 1 reply; 9+ messages in thread
From: Ludovic Courtès @ 2017-06-02 16:33 UTC (permalink / raw)
To: Arun Isaac; +Cc: 26275
Hi Arun,
Arun Isaac <arunisaac@systemreboot.net> skribis:
>> I can't study the code right now, but at a glance it looks like this
>> will also include native-inputs in PERL5LIB. Can you try to filter them
>> out?
>>
>> Doing that will effectively also solve
>> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25235 . Patch welcome! :)
>
> Yes, I'll do this! :-) I'll first send a patch for bug 25235, we'll
> close that, and then come back here.
What’s the status of this patch? It might still be time for
‘core-updates’ if it’s ready…
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase.
2017-03-27 19:38 bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase Arun Isaac
2017-03-28 15:18 ` Marius Bakke
@ 2020-11-16 18:03 ` Jonathan Brielmaier
1 sibling, 0 replies; 9+ messages in thread
From: Jonathan Brielmaier @ 2020-11-16 18:03 UTC (permalink / raw)
To: 26275-done
Functionality was added in 0fb9a8df429a7b9f40610ff15baaff0d8e31e8cf by
Ricardo.
^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <20170327193850.12655-1-arunisaac@systemreboot.net>]
* bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase.
[not found] <20170327193850.12655-1-arunisaac@systemreboot.net>
@ 2017-03-27 19:49 ` Arun Isaac
2017-03-28 14:33 ` Arun Isaac
1 sibling, 0 replies; 9+ messages in thread
From: Arun Isaac @ 2017-03-27 19:49 UTC (permalink / raw)
To: 26275
As discussed earlier at bug 26203
(https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26203), I have added a
`wrap' phase to the perl-build-system. Please consider this a first
iteration and provide feedback.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase.
[not found] <20170327193850.12655-1-arunisaac@systemreboot.net>
2017-03-27 19:49 ` Arun Isaac
@ 2017-03-28 14:33 ` Arun Isaac
2017-04-10 21:53 ` Ludovic Courtès
1 sibling, 1 reply; 9+ messages in thread
From: Arun Isaac @ 2017-03-28 14:33 UTC (permalink / raw)
To: 26275
> +(define* (wrap #:key inputs outputs #:allow-other-keys)
> + (define (list-of-files dir)
> + (map (cut string-append dir "/" <>)
> + (or (scandir dir (lambda (f)
> + (let ((s (stat (string-append dir "/" f))))
> + (eq? 'regular (stat:type s)))))
> + '())))
> +
> + (define bindirs
> + (append-map (match-lambda
> + ((_ . dir)
> + (list (string-append dir "/bin")
> + (string-append dir "/sbin"))))
> + outputs))
> +
> + (let* ((out (assoc-ref outputs "out"))
> + (var `("PERL5LIB" prefix
> + ,(search-path-as-string->list
> + (or (getenv "PERL5LIB") "")))))
> + (for-each (lambda (dir)
> + (let ((files (list-of-files dir)))
> + (for-each (cut wrap-program <> var)
> + files)))
> + bindirs)))
I copied this wrap function from the python build system, and modified
it a little to suite perl. Is there any reason `list-of-files' and
`bindirs' are initialized using `define' rather than a `let' binding?
This is probably a very basic Guile question, but still...
Thanks,
Arun Isaac.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase.
2017-03-28 14:33 ` Arun Isaac
@ 2017-04-10 21:53 ` Ludovic Courtès
0 siblings, 0 replies; 9+ messages in thread
From: Ludovic Courtès @ 2017-04-10 21:53 UTC (permalink / raw)
To: Arun Isaac; +Cc: 26275
Hi,
And sorry for the delay.
Arun Isaac <arunisaac@systemreboot.net> skribis:
>> +(define* (wrap #:key inputs outputs #:allow-other-keys)
>> + (define (list-of-files dir)
>> + (map (cut string-append dir "/" <>)
>> + (or (scandir dir (lambda (f)
>> + (let ((s (stat (string-append dir "/" f))))
>> + (eq? 'regular (stat:type s)))))
>> + '())))
>> +
>> + (define bindirs
>> + (append-map (match-lambda
>> + ((_ . dir)
>> + (list (string-append dir "/bin")
>> + (string-append dir "/sbin"))))
>> + outputs))
>> +
>> + (let* ((out (assoc-ref outputs "out"))
>> + (var `("PERL5LIB" prefix
>> + ,(search-path-as-string->list
>> + (or (getenv "PERL5LIB") "")))))
>> + (for-each (lambda (dir)
>> + (let ((files (list-of-files dir)))
>> + (for-each (cut wrap-program <> var)
>> + files)))
>> + bindirs)))
>
> I copied this wrap function from the python build system, and modified
> it a little to suite perl. Is there any reason `list-of-files' and
> `bindirs' are initialized using `define' rather than a `let' binding?
> This is probably a very basic Guile question, but still...
It’s purely cosmetic in this case: it makes them more visible and fits
within the 80-column limit. :-)
Technically:
(define (proc x y)
(define a …)
(define b …)
body …)
is equivalent to:
(define (proc x y)
(letrec ((a …)
(b …))
body …))
See <https://gnu.org/software/guile/manual/html_node/Local-Bindings.html>.
HTH!
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-11-16 18:05 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-27 19:38 bug#26275: [PATCH] build: perl-build-system: Add `wrap' phase Arun Isaac
2017-03-28 15:18 ` Marius Bakke
2017-03-28 17:02 ` Arun Isaac
2017-06-02 16:33 ` Ludovic Courtès
2017-06-02 17:40 ` Arun Isaac
2020-11-16 18:03 ` Jonathan Brielmaier
[not found] <20170327193850.12655-1-arunisaac@systemreboot.net>
2017-03-27 19:49 ` Arun Isaac
2017-03-28 14:33 ` Arun Isaac
2017-04-10 21:53 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).