* [bug#65565] [PATCH] gnu: chaiscript: Fix tests.
@ 2023-08-27 12:30 iyzsong--- via Guix-patches via
2023-08-27 15:09 ` Adam Faiz via Guix-patches via
2023-08-29 10:40 ` [bug#65565] [PATCH v2] " iyzsong--- via Guix-patches via
0 siblings, 2 replies; 4+ messages in thread
From: iyzsong--- via Guix-patches via @ 2023-08-27 12:30 UTC (permalink / raw)
To: 65565; +Cc: 宋文武
From: 宋文武 <iyzsong@member.fsf.org>
* gnu/packages/cpp.scm (chaiscript)[arguments]: Add fix-tests phase.
---
gnu/packages/cpp.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 3b949198c7..4681963794 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -511,6 +511,15 @@ (define-public chaiscript
(sha256
(base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c"))))
(build-system cmake-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ ;; Its bundled catch2 fails to build with glibc-2.35.
+ (copy-file #$(file-append catch2 "/include/catch2/catch.hpp")
+ "unittests/catch.hpp"))))))
(home-page "https://chaiscript.com/")
(synopsis "Embedded scripting language designed for C++")
(description
base-commit: 8b4a248fc4765212a4103c4520ae1f901937df41
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#65565] [PATCH] gnu: chaiscript: Fix tests.
2023-08-27 12:30 [bug#65565] [PATCH] gnu: chaiscript: Fix tests iyzsong--- via Guix-patches via
@ 2023-08-27 15:09 ` Adam Faiz via Guix-patches via
2023-08-29 10:46 ` 宋文武 via Guix-patches via
2023-08-29 10:40 ` [bug#65565] [PATCH v2] " iyzsong--- via Guix-patches via
1 sibling, 1 reply; 4+ messages in thread
From: Adam Faiz via Guix-patches via @ 2023-08-27 15:09 UTC (permalink / raw)
To: iyzsong; +Cc: 65565
> + (arguments
> + (list
> + #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'fix-tests
> + (lambda _
> + ;; Its bundled catch2 fails to build with glibc-2.35.
> + (copy-file #$(file-append catch2 "/include/catch2/catch.hpp")
> + "unittests/catch.hpp")))))
Bundling a newer catch2 is not the solution, it's better to delete the bundled header so that it uses the catch2 provided in its inputs.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#65565] [PATCH] gnu: chaiscript: Fix tests.
2023-08-27 15:09 ` Adam Faiz via Guix-patches via
@ 2023-08-29 10:46 ` 宋文武 via Guix-patches via
0 siblings, 0 replies; 4+ messages in thread
From: 宋文武 via Guix-patches via @ 2023-08-29 10:46 UTC (permalink / raw)
To: Adam Faiz; +Cc: 65565
Adam Faiz <adam.faiz@disroot.org> writes:
>> + (arguments
>> + (list
>> + #:phases
>> + #~(modify-phases %standard-phases
>> + (add-after 'unpack 'fix-tests
>> + (lambda _
>> + ;; Its bundled catch2 fails to build with glibc-2.35.
>> + (copy-file #$(file-append catch2 "/include/catch2/catch.hpp")
>> + "unittests/catch.hpp")))))
> Bundling a newer catch2 is not the solution, it's better to delete the
> bundled header so that it uses the catch2 provided in its inputs.
Um, this copy-file has the same result, it replace the bundled one with
our catch2, anyway I sent a v2 with 'snippet' and 'inputs'.
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#65565] [PATCH v2] gnu: chaiscript: Fix tests.
2023-08-27 12:30 [bug#65565] [PATCH] gnu: chaiscript: Fix tests iyzsong--- via Guix-patches via
2023-08-27 15:09 ` Adam Faiz via Guix-patches via
@ 2023-08-29 10:40 ` iyzsong--- via Guix-patches via
1 sibling, 0 replies; 4+ messages in thread
From: iyzsong--- via Guix-patches via @ 2023-08-29 10:40 UTC (permalink / raw)
To: 65565; +Cc: 宋文武
From: 宋文武 <iyzsong@member.fsf.org>
* gnu/packages/cpp.scm (chaiscript)[source]: Add snippet.
[inputs]: Add catch2.
---
gnu/packages/cpp.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 3b949198c7..2f8cc2ce25 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -509,8 +509,17 @@ (define-public chaiscript
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c"))))
+ (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c"))
+ (modules '((guix build utils)))
+ ;; It's bundled catch2 fails to build.
+ (snippet '(begin
+ (delete-file "unittests/catch.hpp")
+ (substitute* "unittests/compiled_tests.cpp"
+ (("catch[.]hpp") "catch2/catch.hpp"))
+ (substitute* "unittests/type_info_test.cpp"
+ (("catch[.]hpp") "catch2/catch.hpp"))))))
(build-system cmake-build-system)
+ (inputs (list catch2))
(home-page "https://chaiscript.com/")
(synopsis "Embedded scripting language designed for C++")
(description
base-commit: 715d203b414727be43e405d09e86aa823125a4b3
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-29 10:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-27 12:30 [bug#65565] [PATCH] gnu: chaiscript: Fix tests iyzsong--- via Guix-patches via
2023-08-27 15:09 ` Adam Faiz via Guix-patches via
2023-08-29 10:46 ` 宋文武 via Guix-patches via
2023-08-29 10:40 ` [bug#65565] [PATCH v2] " iyzsong--- via Guix-patches via
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.