bug#26760: [PATCH] gnu: guile-bytestructures: Install sld files.

bug#26760: [PATCH] gnu: guile-bytestructures: Install sld files.

[Mathieu Othacehe]

* gnu/packages/guile.scm (guile-bytestructures): Build and install sld
  files in r7 repository.

It fixes this kind of errors while using guile-bytestructures:

ice-9/psyntax.scm:3245:33: ice-9/psyntax.scm:3245:33: Syntax error:
/gnu/store/ny9mp091yw51ylv1q59z25z5vdw8bi56-profile/share/guile/site/2.2/bytestructures/guile/base.scm:8:19: include-from-path: file not found in path in subform "bytestructures/r7/base.exports.sld" of (include-from-path "bytestructures/r7/base.exports.sld")
---
 gnu/packages/guile.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 32d67794e..c2f31fc8a 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1471,6 +1471,8 @@ is no support for parsing block and inline level HTML.")
                                            effective))
                 (source (assoc-ref %build-inputs "source"))
                 (doc (string-append out "/share/doc/scheme-bytestructures"))
+                (sld-files (with-directory-excursion source
+                             (find-files "bytestructures/r7" "\\.exports.sld$")))
                 (scm-files (filter (lambda (path)
                                      (not (string-prefix? "bytestructures/r7" path)))
                                    (with-directory-excursion source
@@ -1502,7 +1504,7 @@ is no support for parsing block and inline level HTML.")
                                                  file))
                            (error (format #f "Failed to compile ~s to ~s!"
                                           file go-file)))))
-                     scm-files)
+                     (append sld-files scm-files))
 
            ;; Also copy over the README.
            (install-file "README.md" doc)
-- 
2.12.2

bug#26760: [PATCH] gnu: guile-bytestructures: Install sld files.

[Ludovic Courtès]

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

> * gnu/packages/guile.scm (guile-bytestructures): Build and install sld
>   files in r7 repository.
>
> It fixes this kind of errors while using guile-bytestructures:
>
> ice-9/psyntax.scm:3245:33: ice-9/psyntax.scm:3245:33: Syntax error:
> /gnu/store/ny9mp091yw51ylv1q59z25z5vdw8bi56-profile/share/guile/site/2.2/bytestructures/guile/base.scm:8:19: include-from-path: file not found in path in subform "bytestructures/r7/base.exports.sld" of (include-from-path "bytestructures/r7/base.exports.sld")

LGTM!  (.sld is an R7 thing?  I never got used to the R6 file extensions
to begin with…)

Ludo’.

bug#26760: [PATCH] gnu: guile-bytestructures: Install sld files.

[Mathieu Othacehe]

> LGTM!  (.sld is an R7 thing?  I never got used to the R6 file extensions
> to begin with…)

Yes .sld files contain R7RS library definitions. There are two kinds of
.sld in guile-bytestructures:

* r7/*.sld : library definitions not compilable with guile
* r7/*.exports.sld : (export ...) definitions used in
bytestructures/guile/ folder and compilable with guile.

I'm not really familiar with this but it makes sense to me to include
.exports.sld files in guile-bytestructure build.

Mathieu

bug#26760: [PATCH] gnu: guile-bytestructures: Install sld files.

[Mathieu Othacehe]

Hi,

I pushed it in commit e8e1ace0394dd979a1ad5459ebb5b9247f7ff1d7.

My work on (guix git) seems functional on guile 2.2. Now do you think I
shall wait for Guix to switch to 2.2 before sending something to
review, or backport guile-git and guile-bytestructures to guile 2.0 ?

Thanks,

Mathieu

Ludovic Courtès writes:

> Mathieu Othacehe <m.othacehe@gmail.com> skribis:
>
>> * gnu/packages/guile.scm (guile-bytestructures): Build and install sld
>>   files in r7 repository.
>>
>> It fixes this kind of errors while using guile-bytestructures:
>>
>> ice-9/psyntax.scm:3245:33: ice-9/psyntax.scm:3245:33: Syntax error:
>> /gnu/store/ny9mp091yw51ylv1q59z25z5vdw8bi56-profile/share/guile/site/2.2/bytestructures/guile/base.scm:8:19: include-from-path: file not found in path in subform "bytestructures/r7/base.exports.sld" of (include-from-path "bytestructures/r7/base.exports.sld")
>
> LGTM!  (.sld is an R7 thing?  I never got used to the R6 file extensions
> to begin with…)
>
> Ludo’.

bug#26760: [PATCH] gnu: guile-bytestructures: Install sld files.

[Ludovic Courtès]

Hi,

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

> I pushed it in commit e8e1ace0394dd979a1ad5459ebb5b9247f7ff1d7.

Great.  I’m closing this issue.

> My work on (guix git) seems functional on guile 2.2. Now do you think I
> shall wait for Guix to switch to 2.2 before sending something to
> review, or backport guile-git and guile-bytestructures to guile 2.0 ?

No, no need to backport.  I think you can post what you have now if you
want.  Then we can either push it right way, with a proper configure.ac
check for the (git) module (which will always fail when using Guile
2.0), or put it in a branch until after the release.

Thanks,
Ludo’.