unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* guix shell: error: symlink: File exists: "/bin/cc"
@ 2024-10-13 16:45 Marco Fortina
  2024-10-23 20:26 ` Ludovic Courtès
  0 siblings, 1 reply; 4+ messages in thread
From: Marco Fortina @ 2024-10-13 16:45 UTC (permalink / raw)
  To: guix-devel@gnu.org

[-- Attachment #1: Type: text/plain, Size: 1931 bytes --]

Hello there.

I have this issue when with guix time-machine shell when using --emulate-fhs option and having gcc-toolset and clang-toolset in my manifest.scm.

I this this could be solved with this patch:

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 9f851a478e..7a276569e9 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -512,8 +512,10 @@ (define-public (make-clang-toolchain clang libomp)
                      ;; Create 'cc' and 'c++' so that one can use it as a
                      ;; drop-in replacement for the default tool chain and
                      ;; have configure scripts find the compiler.
-                     (symlink "clang" (string-append out "/bin/cc"))
-                     (symlink "clang++" (string-append out "/bin/c++"))
+                     (unless (file-exists? "/bin/cc")
+                         (symlink "clang" (string-append out "/bin/cc")))
+                     (unless (file-exists? "/bin/c++")
+                         (symlink "clang++" (string-append out "/bin/c++")))

                      (union-build (assoc-ref %outputs "debug")
                                   (list (assoc-ref %build-inputs
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index a219b2ac89..72e56367a8 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -465,7 +465,8 @@ (define* (link-contents dir #:key (exclude '()))
   ;; bin directories will link to /bin.
   (let ((gcc-path (string-append profile "/bin/gcc")))
     (if (file-exists? gcc-path)
-        (symlink gcc-path "/bin/cc")))
+        (unless (file-exists? "/bin/cc")
+            (symlink gcc-path "/bin/cc"))))

   ;; Guix's ldconfig doesn't search in FHS default locations, so provide a
   ;; minimal ld.so.conf.


This patch will create the symlinks only if destination files is not already present.

Thanks

[-- Attachment #2: Type: text/html, Size: 7271 bytes --]

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: guix shell: error: symlink: File exists: "/bin/cc"
  2024-10-13 16:45 guix shell: error: symlink: File exists: "/bin/cc" Marco Fortina
@ 2024-10-23 20:26 ` Ludovic Courtès
  2024-10-23 20:26   ` Rutherther
  2024-10-24  8:02   ` R: " Marco Fortina
  0 siblings, 2 replies; 4+ messages in thread
From: Ludovic Courtès @ 2024-10-23 20:26 UTC (permalink / raw)
  To: Marco Fortina; +Cc: guix-devel@gnu.org

[-- Attachment #1: Type: text/plain, Size: 1833 bytes --]

Hi,

Marco Fortina <marco_fortina@hotmail.it> skribis:

> I have this issue when with guix time-machine shell when using --emulate-fhs option and having gcc-toolset and clang-toolset in my manifest.scm.

I tried, and for those reading along, the problem is:

--8<---------------cut here---------------start------------->8---
$ guix shell -CF gcc-toolchain clang-toolchain
guix shell: error: symlink: File exists: "/bin/cc"
--8<---------------cut here---------------end--------------->8---

> --- a/gnu/packages/llvm.scm
> +++ b/gnu/packages/llvm.scm
> @@ -512,8 +512,10 @@ (define-public (make-clang-toolchain clang libomp)
>                       ;; Create 'cc' and 'c++' so that one can use it as a
>                       ;; drop-in replacement for the default tool chain and
>                       ;; have configure scripts find the compiler.
> -                     (symlink "clang" (string-append out "/bin/cc"))
> -                     (symlink "clang++" (string-append out "/bin/c++"))
> +                     (unless (file-exists? "/bin/cc")
> +                         (symlink "clang" (string-append out "/bin/cc")))
> +                     (unless (file-exists? "/bin/c++")
> +                         (symlink "clang++" (string-append out "/bin/c++")))

This part has no effect (there’s no /bin/cc in the build environment.)

> +++ b/guix/scripts/environment.scm
> @@ -465,7 +465,8 @@ (define* (link-contents dir #:key (exclude '()))
>    ;; bin directories will link to /bin.
>    (let ((gcc-path (string-append profile "/bin/gcc")))
>      (if (file-exists? gcc-path)
> -        (symlink gcc-path "/bin/cc")))
> +        (unless (file-exists? "/bin/cc")
> +            (symlink gcc-path "/bin/cc"))))

Good catch!  I’m proposing a slightly modified variant of this change:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 965 bytes --]

diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index a219b2ac89..fc7fa84be7 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -464,8 +464,15 @@ (define (setup-fhs profile)
   ;; /bin since that already has the sh symlink and the other (optional) FHS
   ;; bin directories will link to /bin.
   (let ((gcc-path (string-append profile "/bin/gcc")))
-    (if (file-exists? gcc-path)
-        (symlink gcc-path "/bin/cc")))
+    (when (file-exists? gcc-path)
+      (catch 'system-error
+        (lambda ()
+          (symlink gcc-path "/bin/cc"))
+        (lambda args
+          ;; If /bin/cc already exists because it was provided by another
+          ;; package in PROFILE, such as 'clang-toolchain', leave it.
+          (unless (= EEXIST (system-error-errno args))
+            (apply throw args))))))
 
   ;; Guix's ldconfig doesn't search in FHS default locations, so provide a
   ;; minimal ld.so.conf.

[-- Attachment #3: Type: text/plain, Size: 100 bytes --]


I’ll push it soon if there are no objections.

Thanks for reporting the problem!

Ludo’.

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: guix shell: error: symlink: File exists: "/bin/cc"
  2024-10-23 20:26 ` Ludovic Courtès
@ 2024-10-23 20:26   ` Rutherther
  2024-10-24  8:02   ` R: " Marco Fortina
  1 sibling, 0 replies; 4+ messages in thread
From: Rutherther @ 2024-10-23 20:26 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel@gnu.org, Marco Fortina


Hello, note that this is linked to issue #73799,
since the original patch was submitted both to
guix-devel and guix-patches.

Regards,
Rutherther


^ permalink raw reply	[flat|nested] 4+ messages in thread

* R: guix shell: error: symlink: File exists: "/bin/cc"
  2024-10-23 20:26 ` Ludovic Courtès
  2024-10-23 20:26   ` Rutherther
@ 2024-10-24  8:02   ` Marco Fortina
  1 sibling, 0 replies; 4+ messages in thread
From: Marco Fortina @ 2024-10-24  8:02 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel@gnu.org

[-- Attachment #1: Type: text/plain, Size: 3827 bytes --]

Hello!

Yes, only changes in the environment.scm files are required for fixing the issue.

Why did you make the patch so complex?

> --- a/guix/scripts/environment.scm
> +++ b/guix/scripts/environment.scm
> @@ -464,8 +464,15 @@ (define (setup-fhs profile)
>    ;; /bin since that already has the sh symlink and the other (optional) FHS
>    ;; bin directories will link to /bin.
>    (let ((gcc-path (string-append profile "/bin/gcc")))
> -    (if (file-exists? gcc-path)
> -        (symlink gcc-path "/bin/cc")))
> +    (when (file-exists? gcc-path)
> +      (catch 'system-error
> +        (lambda ()
> +          (symlink gcc-path "/bin/cc"))
> +        (lambda args
> +          ;; If /bin/cc already exists because it was provided by another
> +          ;; package in PROFILE, such as 'clang-toolchain', leave it.
> +          (unless (= EEXIST (system-error-errno args))
> +            (apply throw args))))))
>
>    ;; Guix's ldconfig doesn't search in FHS default locations, so provide a
>    ;; minimal ld.so.conf.


was not enough ?

diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index a219b2ac89..37f11395f9 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -464,7 +464,8 @@ (define (setup-fhs profile)
   ;; /bin since that already has the sh symlink and the other (optional) FHS
   ;; bin directories will link to /bin.
   (let ((gcc-path (string-append profile "/bin/gcc")))
-    (if (file-exists? gcc-path)
+    (if (and (file-exists? gcc-path)
+             (not (file-exists? "/bin/cc")))
         (symlink gcc-path "/bin/cc")))

   ;; Guix's ldconfig doesn't search in FHS default locations, so provide a


________________________________
Da: Ludovic Courtès <ludo@gnu.org>
Inviato: mercoledì 23 ottobre 2024 22:26
A: Marco Fortina <marco_fortina@hotmail.it>
Cc: guix-devel@gnu.org <guix-devel@gnu.org>
Oggetto: Re: guix shell: error: symlink: File exists: "/bin/cc"

Hi,

Marco Fortina <marco_fortina@hotmail.it> skribis:

> I have this issue when with guix time-machine shell when using --emulate-fhs option and having gcc-toolset and clang-toolset in my manifest.scm.

I tried, and for those reading along, the problem is:

--8<---------------cut here---------------start------------->8---
$ guix shell -CF gcc-toolchain clang-toolchain
guix shell: error: symlink: File exists: "/bin/cc"
--8<---------------cut here---------------end--------------->8---

> --- a/gnu/packages/llvm.scm
> +++ b/gnu/packages/llvm.scm
> @@ -512,8 +512,10 @@ (define-public (make-clang-toolchain clang libomp)
>                       ;; Create 'cc' and 'c++' so that one can use it as a
>                       ;; drop-in replacement for the default tool chain and
>                       ;; have configure scripts find the compiler.
> -                     (symlink "clang" (string-append out "/bin/cc"))
> -                     (symlink "clang++" (string-append out "/bin/c++"))
> +                     (unless (file-exists? "/bin/cc")
> +                         (symlink "clang" (string-append out "/bin/cc")))
> +                     (unless (file-exists? "/bin/c++")
> +                         (symlink "clang++" (string-append out "/bin/c++")))

This part has no effect (there’s no /bin/cc in the build environment.)

> +++ b/guix/scripts/environment.scm
> @@ -465,7 +465,8 @@ (define* (link-contents dir #:key (exclude '()))
>    ;; bin directories will link to /bin.
>    (let ((gcc-path (string-append profile "/bin/gcc")))
>      (if (file-exists? gcc-path)
> -        (symlink gcc-path "/bin/cc")))
> +        (unless (file-exists? "/bin/cc")
> +            (symlink gcc-path "/bin/cc"))))

Good catch!  I’m proposing a slightly modified variant of this change:


[-- Attachment #2: Type: text/html, Size: 10022 bytes --]

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-10-24  8:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-13 16:45 guix shell: error: symlink: File exists: "/bin/cc" Marco Fortina
2024-10-23 20:26 ` Ludovic Courtès
2024-10-23 20:26   ` Rutherther
2024-10-24  8:02   ` R: " Marco Fortina

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).