[bug#61673] [PATCH 0/1] GNULIB_SRCDIR should not allow multiple entries

[bug#61673] [PATCH 0/1] GNULIB_SRCDIR should not allow multiple entries

[Vivien Kraus via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

Dear guix,

GNULIB_SRCDIR is an environment that should be set when gnulib is in the profile. To do that, I made it a search path specification, but I did not know that I could prevent multiple entries.

I was told in #60358 that I could use (separator #f), so here is the fix. Sorry I’m late!

Vivien

Vivien Kraus (1):
  gnu: gnulib: Allow only one directory name in GNULIB_SRCDIR.

 gnu/packages/build-tools.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


base-commit: 73b5c955ae46af2548625fe31afe60193fb83e2a
-- 
2.39.1

[bug#61673] [PATCH 1/1] gnu: gnulib: Allow only one directory name in GNULIB_SRCDIR.

[Vivien Kraus via Guix-patches via]

* gnu/packages/build-tools.scm (gnulib-checkout) [search-path-specification
GNULIB_SRCDIR]: Set separator to #f.
---
 gnu/packages/build-tools.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 3d03c37a2c..00b8f8caf3 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -997,7 +997,8 @@ (define (find-ucd-files . names)
     (native-search-paths
      (list (search-path-specification
             (variable "GNULIB_SRCDIR")
-            (files (list "src/gnulib")))))
+            (files (list "src/gnulib"))
+            (separator #f))))
     (license (list license:lgpl2.0+ license:gpl3+))))
 
 (define-public gnulib
-- 
2.39.1

bug#61673: [PATCH 0/1] GNULIB_SRCDIR should not allow multiple entries

[Ludovic Courtès]

Vivien Kraus <vivien@planete-kraus.eu> skribis:

> * gnu/packages/build-tools.scm (gnulib-checkout) [search-path-specification
> GNULIB_SRCDIR]: Set separator to #f.

Applied, thanks!