[PATCH 0/5] gnu: Fix build of some maven packages.

  • Done
  • quality assurance status badge
Details
2 participants
  • Aleksandr Vityazev
  • Ludovic Courtès
Owner
unassigned
Submitted by
Aleksandr Vityazev
Severity
normal
A
A
Aleksandr Vityazev wrote on 26 Apr 2023 19:30
(address . guix-patches@gnu.org)
87h6t2eeke.fsf@posteo.org
Hi Guix!

This patch series fix build of some maven packages.

Aleksandr Vityazev (5):

gnu: maven-embedder: Fix build.
gnu: maven-core-bootstrap: Fix build.
gnu: maven-resolver-provider: Fix build.
gnu: maven-model-builder: Fix build.
gnu: maven-settings-builder: Fix build.

--
Best regards,
Aleksandr Vityazev
A
A
Aleksandr Vityazev wrote on 26 Apr 2023 19:32
[PATCH] gnu: maven-settings-builder: Fix build.
(address . 63094@debbugs.gnu.org)
87fs8meegk.fsf@gmail.com
* gnu/packages/maven (maven-settings-builder)[arguments]:
Add the'add-sisu-shebang phase after unpack.
---
gnu/packages/maven.scm | 4 ++++
1 file changed, 4 insertions(+)

Toggle diff (22 lines)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index fc3a63c263..5781d17238 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1365,6 +1365,10 @@ (define-public maven-settings-builder
#:test-dir "maven-settings-builder/src/test"
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'add-sisu-shebang
+ (lambda _
+ (substitute* "sisu.sh"
+ (("^## T") "#!/bin/sh\n## T"))))
(add-before 'build 'generate-sisu-named
(lambda _
(mkdir-p "build/classes/META-INF/sisu")
--
2.39.2


--

Aleksandr Vityazev
A
A
Aleksandr Vityazev wrote on 26 Apr 2023 19:33
[PATCH] gnu: maven-model-builder: Fix build.
(address . 63094@debbugs.gnu.org)
87edo6eeg7.fsf@gmail.com
* gnu/packages/maven (maven-model-builder)[arguments]:
Add the'add-sisu-shebang phase after unpack.
---
gnu/packages/maven.scm | 4 ++++
1 file changed, 4 insertions(+)

Toggle diff (22 lines)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 5781d17238..cfadec0a01 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1410,6 +1410,10 @@ (define-public maven-model-builder
(copy-recursively "src/main/resources"
"build/classes")
#t))
+ (add-after 'unpack 'add-sisu-shebang
+ (lambda _
+ (substitute* "sisu.sh"
+ (("^## T") "#!/bin/sh\n## T"))))
(add-before 'build 'generate-sisu-named
(lambda _
(mkdir-p "build/classes/META-INF/sisu")
--
2.39.2


--

Aleksandr Vityazev
A
A
Aleksandr Vityazev wrote on 26 Apr 2023 19:33
[PATCH] gnu: maven-resolver-provider: Fix build.
(address . 63094@debbugs.gnu.org)
87cz3qeefu.fsf@gmail.com
* gnu/packages/maven (maven-resolver-provider)[arguments]:
Add the'add-sisu-shebang phase after unpack.
---
gnu/packages/maven.scm | 4 ++++
1 file changed, 4 insertions(+)

Toggle diff (22 lines)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index cfadec0a01..e57b288779 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1509,6 +1509,10 @@ (define-public maven-resolver-provider
#:tests? #f; dependency loop on maven-core (@Component RepositorySystem)
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'add-sisu-shebang
+ (lambda _
+ (substitute* "sisu.sh"
+ (("^## T") "#!/bin/sh\n## T"))))
(add-before 'build 'generate-sisu-named
(lambda _
(mkdir-p "build/classes/META-INF/sisu")
--
2.39.2


--

Aleksandr Vityazev
A
A
Aleksandr Vityazev wrote on 26 Apr 2023 19:33
[PATCH] gnu: maven-core-bootstrap: Fix build.
(address . 63094@debbugs.gnu.org)
87bkjaeefh.fsf@gmail.com
* gnu/packages/maven (maven-core-bootstrap)[arguments]:
Add the'add-sisu-shebang phase after unpack.
---
gnu/packages/maven.scm | 4 ++++
1 file changed, 4 insertions(+)

Toggle diff (22 lines)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index e57b288779..6c2958fa11 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1603,6 +1603,10 @@ (define-public maven-core-bootstrap
#:tests? #f
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'add-sisu-shebang
+ (lambda _
+ (substitute* "sisu.sh"
+ (("^## T") "#!/bin/sh\n## T"))))
(add-before 'configure 'chdir
(lambda _
;; Required for generating components.xml in maven-core
--
2.39.2


--

Aleksandr Vityazev
A
A
Aleksandr Vityazev wrote on 26 Apr 2023 19:33
[PATCH] gnu: maven-embedder: Fix build.
(address . 63094@debbugs.gnu.org)
87a5yueef3.fsf@gmail.com
* gnu/packages/maven (maven-embedder)[arguments]:
Add the'add-sisu-shebang phase after unpack.
---
gnu/packages/maven.scm | 5 +++++
1 file changed, 5 insertions(+)

Toggle diff (30 lines)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 6c2958fa11..a805bda8e5 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023 Aleksandr Vityazev <avityazew@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1838,6 +1839,10 @@ (define-public maven-embedder
#:jdk ,icedtea-8
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'add-sisu-shebang
+ (lambda _
+ (substitute* "sisu.sh"
+ (("^## T") "#!/bin/sh\n## T"))))
(add-before 'build 'generate-sisu-named
(lambda _
(mkdir-p "build/classes/META-INF/sisu")
--
2.39.2


--

Aleksandr Vityazev
L
L
Ludovic Courtès wrote on 28 Apr 2023 21:06
Re: bug#63094: [PATCH 0/5] gnu: Fix build of some maven packages.
(name . Aleksandr Vityazev)(address . avityazew@gmail.com)(address . 63094-done@debbugs.gnu.org)
87jzxvsu67.fsf@gnu.org
Hi,

Aleksandr Vityazev <avityazew@gmail.com> skribis:

Toggle quote (6 lines)
> gnu: maven-embedder: Fix build.
> gnu: maven-core-bootstrap: Fix build.
> gnu: maven-resolver-provider: Fix build.
> gnu: maven-model-builder: Fix build.
> gnu: maven-settings-builder: Fix build.

Applied, thanks. It might be worth factorizing as has been proposed in

Thanks,
Ludo’.
Closed
?