* [bug#47332] [PATCH 1/2] Update minetest and minetest-data to 5.4.0
@ 2021-03-23 0:06 la snesne
2021-03-23 0:06 ` [bug#47333] [PATCH 2/2] Enable test of minetest la snesne
2021-03-23 0:28 ` [bug#47332] " la snesne
0 siblings, 2 replies; 6+ messages in thread
From: la snesne @ 2021-03-23 0:06 UTC (permalink / raw)
To: 47332; +Cc: la snesne
---
gnu/packages/games.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2f48a9fb75..f1ee7e9971 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3464,7 +3464,7 @@ match, cannon keep, and grave-itation pit.")
(define-public minetest
(package
(name "minetest")
- (version "5.3.0")
+ (version "5.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3473,7 +3473,7 @@ match, cannon keep, and grave-itation pit.")
(file-name (git-file-name name version))
(sha256
(base32
- "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6"))
+ "1a17g6cmxrscnqwpwrd4w2ck3dgvplyfq4kzyimilfpqar1q69j9"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -3541,7 +3541,7 @@ in different ways.")
(file-name (git-file-name name version))
(sha256
(base32
- "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx"))))
+ "11dz36z0pj2r7i8xm8v5lskzws81ckj6sc0avlmvdl8qdc9x83w5"))))
(build-system trivial-build-system)
(native-inputs
`(("source" ,source)))
--
2.31.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#47333] [PATCH 2/2] Enable test of minetest
2021-03-23 0:06 [bug#47332] [PATCH 1/2] Update minetest and minetest-data to 5.4.0 la snesne
@ 2021-03-23 0:06 ` la snesne
2021-03-23 0:22 ` bug#47333: oops la snesne
2021-03-23 7:31 ` [bug#47333] [PATCH 2/2] Enable test of minetest Maxime Devos
2021-03-23 0:28 ` [bug#47332] " la snesne
1 sibling, 2 replies; 6+ messages in thread
From: la snesne @ 2021-03-23 0:06 UTC (permalink / raw)
To: 47333; +Cc: la snesne
---
gnu/packages/games.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f1ee7e9971..0ccbde636a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3482,7 +3482,7 @@ match, cannon keep, and grave-itation pit.")
#t))))
(build-system cmake-build-system)
(arguments
- '(#:configure-flags
+ `(#:configure-flags
(list "-DRUN_IN_PLACE=0"
"-DENABLE_FREETYPE=1"
"-DENABLE_GETTEXT=1"
@@ -3493,7 +3493,15 @@ match, cannon keep, and grave-itation pit.")
(string-append "-DCURL_INCLUDE_DIR="
(assoc-ref %build-inputs "curl")
"/include/curl"))
- #:tests? #f)) ;no check target
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke (string-append "../" ,name "-" ,version
+ "-checkout/bin/minetest")
+ "--run-unittests")
+ #t)))))
(native-search-paths
(list (search-path-specification
(variable "MINETEST_SUBGAME_PATH")
--
2.31.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#47333: oops
2021-03-23 0:06 ` [bug#47333] [PATCH 2/2] Enable test of minetest la snesne
@ 2021-03-23 0:22 ` la snesne
2021-03-23 7:31 ` [bug#47333] [PATCH 2/2] Enable test of minetest Maxime Devos
1 sibling, 0 replies; 6+ messages in thread
From: la snesne @ 2021-03-23 0:22 UTC (permalink / raw)
To: 47333-done
[-- Attachment #1.1.1: Type: text/plain, Size: 2 bytes --]
[-- Attachment #1.1.2: OpenPGP_0x3DCFB2469F9A726F.asc --]
[-- Type: application/pgp-keys, Size: 2473 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 665 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#47332] [PATCH 2/2] Enable test of minetest
2021-03-23 0:06 [bug#47332] [PATCH 1/2] Update minetest and minetest-data to 5.4.0 la snesne
2021-03-23 0:06 ` [bug#47333] [PATCH 2/2] Enable test of minetest la snesne
@ 2021-03-23 0:28 ` la snesne
2021-03-23 10:53 ` bug#47332: " Leo Prikler
1 sibling, 1 reply; 6+ messages in thread
From: la snesne @ 2021-03-23 0:28 UTC (permalink / raw)
To: 47332; +Cc: la snesne
---
gnu/packages/games.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f1ee7e9971..0ccbde636a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3482,7 +3482,7 @@ match, cannon keep, and grave-itation pit.")
#t))))
(build-system cmake-build-system)
(arguments
- '(#:configure-flags
+ `(#:configure-flags
(list "-DRUN_IN_PLACE=0"
"-DENABLE_FREETYPE=1"
"-DENABLE_GETTEXT=1"
@@ -3493,7 +3493,15 @@ match, cannon keep, and grave-itation pit.")
(string-append "-DCURL_INCLUDE_DIR="
(assoc-ref %build-inputs "curl")
"/include/curl"))
- #:tests? #f)) ;no check target
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke (string-append "../" ,name "-" ,version
+ "-checkout/bin/minetest")
+ "--run-unittests")
+ #t)))))
(native-search-paths
(list (search-path-specification
(variable "MINETEST_SUBGAME_PATH")
--
2.31.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#47333] [PATCH 2/2] Enable test of minetest
2021-03-23 0:06 ` [bug#47333] [PATCH 2/2] Enable test of minetest la snesne
2021-03-23 0:22 ` bug#47333: oops la snesne
@ 2021-03-23 7:31 ` Maxime Devos
1 sibling, 0 replies; 6+ messages in thread
From: Maxime Devos @ 2021-03-23 7:31 UTC (permalink / raw)
To: la snesne, 47333
[-- Attachment #1: Type: text/plain, Size: 1277 bytes --]
On Tue, 2021-03-23 at 09:06 +0900, la snesne wrote:
> - #:tests? #f)) ;no check target
> + #:phases
> + (modify-phases %standard-phases
> + (replace 'check
> + (lambda _
> + (setenv "HOME" "/tmp")
> + (invoke (string-append "../" ,name "-" ,version
> + "-checkout/bin/minetest")
> + "--run-unittests")
> + #t)))))
For most packages, this is unlikely to work when cross-compiling.
I suggest replacing it with something like
> + (unless ,(%current-target-system)
> + (invoke (string-append "../" ,name "-" ,version
> + "-checkout/bin/minetest")
> + "--run-unittests"))
> + #t
Well, cross-compiling minetest won't work anyway as a dependency is not
cross-compilable:
$ guix build minetest --target=aarch64-linux-gnu
$ guix build: error: gnu/packages/gl.scm:236:2: mesa@20.2.4: build system `meson' does not support cross builds
(and I see little reason to cross-compilable minetest)
... but it still seems a good idea to avoid introducing new
cross-compilation issues when we can avoid it.
Greetings,
Maxime
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#47332: [PATCH 2/2] Enable test of minetest
2021-03-23 0:28 ` [bug#47332] " la snesne
@ 2021-03-23 10:53 ` Leo Prikler
0 siblings, 0 replies; 6+ messages in thread
From: Leo Prikler @ 2021-03-23 10:53 UTC (permalink / raw)
To: la snesne, 47332-done
Hi,
Am Dienstag, den 23.03.2021, 09:06 +0900 schrieb la snesne:
> - (version "5.3.0")
> + (version "5.4.0")
> (source (origin
> (method git-fetch)
> (uri (git-reference
> @@ -3473,7 +3473,7 @@ match, cannon keep, and grave-itation pit.")
> (file-name (git-file-name name version))
> (sha256
> (base32
> - "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh
> 6"))
> + "1a17g6cmxrscnqwpwrd4w2ck3dgvplyfq4kzyimilfpqar1q69j
> 9"))
> (modules '((guix build utils)))
> (snippet
> '(begin
> @@ -3541,7 +3541,7 @@ in different ways.")
> (file-name (git-file-name name version))
> (sha256
> (base32
> - "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cj
> x"))))
> + "11dz36z0pj2r7i8xm8v5lskzws81ckj6sc0avlmvdl8qdc9x83w
> 5"))))
Applied with changes to the commit message.
Am Dienstag, den 23.03.2021, 09:28 +0900 schrieb la snesne:
> ---
> gnu/packages/games.scm | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index f1ee7e9971..0ccbde636a 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -3482,7 +3482,7 @@ match, cannon keep, and grave-itation pit.")
> #t))))
> (build-system cmake-build-system)
> (arguments
> - '(#:configure-flags
> + `(#:configure-flags
> (list "-DRUN_IN_PLACE=0"
> "-DENABLE_FREETYPE=1"
> "-DENABLE_GETTEXT=1"
> @@ -3493,7 +3493,15 @@ match, cannon keep, and grave-itation pit.")
> (string-append "-DCURL_INCLUDE_DIR="
> (assoc-ref %build-inputs "curl")
> "/include/curl"))
> - #:tests? #f)) ;no check target
> + #:phases
> + (modify-phases %standard-phases
> + (replace 'check
> + (lambda _
> + (setenv "HOME" "/tmp")
> + (invoke (string-append "../" ,name "-" ,version
> + "-checkout/bin/minetest")
> + "--run-unittests")
> + #t)))))
> (native-search-paths
> (list (search-path-specification
> (variable "MINETEST_SUBGAME_PATH")
Instead of constructing the name like you did, I patched CMakeLists to
put the binaries into the build folder. I also ensured, that cross-
compilation would work (like Maxime said) and that unittests can
meaningfully be executed after installation. Finally, as before, I
rewrote the commit message.
The changed patches are now upstream as of
7fc1fac64a8d800d651f55a80ff158abd7a90ccb.
Regards,
Leo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-23 10:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-23 0:06 [bug#47332] [PATCH 1/2] Update minetest and minetest-data to 5.4.0 la snesne
2021-03-23 0:06 ` [bug#47333] [PATCH 2/2] Enable test of minetest la snesne
2021-03-23 0:22 ` bug#47333: oops la snesne
2021-03-23 7:31 ` [bug#47333] [PATCH 2/2] Enable test of minetest Maxime Devos
2021-03-23 0:28 ` [bug#47332] " la snesne
2021-03-23 10:53 ` bug#47332: " Leo Prikler
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).