[bug#62171] [PATCH 0/2] Fix source build of OpenJDK 9 and 10

[bug#62171] [PATCH 0/2] Fix source build of OpenJDK 9 and 10

[Björn Höfling]

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

This fixes  62071.

Björn Höfling (2):
  gnu: openjdk9: Build from hg.
  gnu: openjdk10: Build from hg.

 gnu/packages/java.scm | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)


base-commit: 5312d798ac36a72d8a977325a7c6ff7647be670a
-- 
2.39.1

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[bug#62171] [PATCH 1/2] gnu: openjdk9: Build from hg.

[Björn Höfling]

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


* gnu/packages/java.scm (openjdk9)[source]: Use HG-DOWNLOAD.
[homepage]: Update.

This fixes <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62071>
for OpenJDK 9.
---
 gnu/packages/java.scm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 388e9d127f..dff513913c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -852,18 +852,17 @@ (define-public openjdk9
     (name "openjdk")
     (version "9.181")
     (source (origin
-              (method url-fetch)
-              (uri
"https://hg.openjdk.java.net/jdk/jdk/archive/3cc80be736f2.tar.bz2")
-              (file-name (string-append name "-" version ".tar.bz2"))
+              (method hg-fetch)
+              (uri (hg-reference (url "https://hg.openjdk.org/jdk/jdk")
+                                 (changeset "jdk-9+181")))
+              (file-name (hg-file-name name version))
+              (modules '((guix build utils)))
+              (snippet `(begin
+                          (for-each delete-file
+                                    (find-files "."
".*.(bin|exe|jar)$")) #t)) (sha256
                (base32
-
"01ihmyf7k5z17wbr7xig7y40l9f01d5zjgkcmawn1102hw5kchpq"))
-              (modules '((guix build utils)))
-              (snippet
-               `(begin
-                  (for-each delete-file
-                            (find-files "." ".*.(bin|exe|jar)$"))
-                  #t))))
+
"1v92nzdqx07c35x945awzir4yk0fk22vky6fpp8mq9js930sxsz0"))))
(build-system gnu-build-system) (outputs '("out" "jdk" "doc"))
     (arguments
@@ -1024,7 +1023,7 @@ (define (icedtea-or-openjdk? path)
        ("unzip" ,unzip)
        ("which" ,which)
        ("zip" ,zip)))
-    (home-page "https://openjdk.java.net/projects/jdk9/")
+    (home-page "https://openjdk.org/projects/jdk9/")
     (synopsis "Java development kit")
     (description
      "This package provides the Java development kit OpenJDK.")
-- 
2.39.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[bug#62171] [PATCH 0/2] Fix source build of OpenJDK 9 and 10

[Julien Lepiller]

Both LGTM. The snippet doesn't need to end with #t anymore. Also not sure if it's my mail client or the patch, but there's a newline missing at the end of the snippets, before sha256.

Le 13 mars 2023 23:49:35 GMT+01:00, "Björn Höfling" <bjoern.hoefling@bjoernhoefling.de> a écrit :
>This fixes  62071.
>
>Björn Höfling (2):
>  gnu: openjdk9: Build from hg.
>  gnu: openjdk10: Build from hg.
>
> gnu/packages/java.scm | 41 +++++++++++++++++++----------------------
> 1 file changed, 19 insertions(+), 22 deletions(-)
>
>
>base-commit: 5312d798ac36a72d8a977325a7c6ff7647be670a

bug#62171: [PATCH 0/2] Fix source build of OpenJDK 9 and 10

[Björn Höfling]

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



On Tue, 14 Mar 2023 08:02:26 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> Both LGTM. The snippet doesn't need to end with #t anymore. Also not
> sure if it's my mail client or the patch, but there's a newline
> missing at the end of the snippets, before sha256.

Good hint: That newline was left out only in the email. I need to
re-check my client's configuration next time.

Thanks for the review,

with your changes pushed as

7636c49b45adb9870cf416c64bde032ec858a820

Björn

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]