* [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc.
@ 2015-07-19 15:28 Manolis Ragkousis
2015-07-19 21:16 ` Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: Manolis Ragkousis @ 2015-07-19 15:28 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: Guix-devel
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
This patch adds the flag "--disable-libcilkrts" to both cross-gcc,
because currently the build fails when targeting the Hurd.
This patch applies on a rebased wip-hurd on current core-updates branch.
Manolis
[-- Attachment #2: 0001-gnu-cross-base-Disable-libcilkrts-in-cross-gcc.patch --]
[-- Type: text/x-patch, Size: 1518 bytes --]
From 37d96c984baeb4e2857d8338fae3e9459140e8f5 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Sun, 19 Jul 2015 18:16:51 +0300
Subject: [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc.
* gnu/packages/cross-base.scm (cross-gcc-arguments): Add "--disable-libcilkrts".
---
gnu/packages/cross-base.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index e2171f8..7b2e438 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -101,7 +101,9 @@ may be either a libc package or #f.)"
((#:configure-flags flags)
`(append (list ,(string-append "--target=" target)
,@(if libc
- '()
+ `( ;; Disable libcilkrts because it causes the
+ ;; build to fail when targeting the Hurd.
+ "--disable-libcilkrts")
`( ;; Disable features not needed at this stage.
"--disable-shared" "--enable-static"
@@ -117,6 +119,7 @@ may be either a libc package or #f.)"
"--disable-libssp"
"--disable-libquadmath"
"--disable-decimal-float" ;would need libc
+ "--disable-libcilkrts"
)))
,(if libc
--
2.4.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc.
2015-07-19 15:28 [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc Manolis Ragkousis
@ 2015-07-19 21:16 ` Ludovic Courtès
2015-07-21 10:07 ` Manolis Ragkousis
0 siblings, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2015-07-19 21:16 UTC (permalink / raw)
To: Manolis Ragkousis; +Cc: Guix-devel
Manolis Ragkousis <manolis837@gmail.com> skribis:
> From 37d96c984baeb4e2857d8338fae3e9459140e8f5 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Sun, 19 Jul 2015 18:16:51 +0300
> Subject: [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc.
>
> * gnu/packages/cross-base.scm (cross-gcc-arguments): Add "--disable-libcilkrts".
We'll keep it out of master until after 0.8.3 if you don’t mind.
> + `( ;; Disable libcilkrts because it causes the
> + ;; build to fail when targeting the Hurd.
> + "--disable-libcilkrts")
The comment should be more specific: it should make it clear that
libcilkrts is not ported to GNU/Hurd (“causes the build to fail” sounds
like “something went wrong but we didn’t bother”, which is not the case
here!).
Ideally we’d disable it for GNU/Hurd targets only, but OTOH, I think we
can safely assume that nobody will notice that Cilk support is missing...
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc.
2015-07-19 21:16 ` Ludovic Courtès
@ 2015-07-21 10:07 ` Manolis Ragkousis
2015-07-24 20:52 ` Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: Manolis Ragkousis @ 2015-07-21 10:07 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: Guix-devel
[-- Attachment #1: Type: text/plain, Size: 15 bytes --]
Updated patch.
[-- Attachment #2: 0001-gnu-cross-base-Disable-libcilkrts-in-cross-gcc.patch --]
[-- Type: text/x-patch, Size: 1496 bytes --]
From 508b411414809e7185d9c9d7ed782bdddc07c1b5 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Sun, 19 Jul 2015 18:16:51 +0300
Subject: [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc.
* gnu/packages/cross-base.scm (cross-gcc-arguments): Add "--disable-libcilkrts".
---
gnu/packages/cross-base.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 4ab3cf0..2e4bd03 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -101,7 +101,9 @@ may be either a libc package or #f.)"
((#:configure-flags flags)
`(append (list ,(string-append "--target=" target)
,@(if libc
- '()
+ `( ;; Disable libcilkrts because it is not
+ ;; ported to GNU/Hurd.
+ "--disable-libcilkrts")
`( ;; Disable features not needed at this stage.
"--disable-shared" "--enable-static"
@@ -117,6 +119,7 @@ may be either a libc package or #f.)"
"--disable-libssp"
"--disable-libquadmath"
"--disable-decimal-float" ;would need libc
+ "--disable-libcilkrts"
)))
,(if libc
--
2.4.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc.
2015-07-21 10:07 ` Manolis Ragkousis
@ 2015-07-24 20:52 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2015-07-24 20:52 UTC (permalink / raw)
To: Manolis Ragkousis; +Cc: Guix-devel
Manolis Ragkousis <manolis837@gmail.com> skribis:
> From 508b411414809e7185d9c9d7ed782bdddc07c1b5 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Sun, 19 Jul 2015 18:16:51 +0300
> Subject: [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc.
>
> * gnu/packages/cross-base.scm (cross-gcc-arguments): Add "--disable-libcilkrts".
OK for master, thanks!
Ludo'.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-24 20:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-19 15:28 [PATCH] gnu: cross-base: Disable libcilkrts in cross-gcc Manolis Ragkousis
2015-07-19 21:16 ` Ludovic Courtès
2015-07-21 10:07 ` Manolis Ragkousis
2015-07-24 20:52 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.