[bug#68575] [PATCH core-updates 0/3] Fix openjdk build.

[bug#68575] [PATCH core-updates 0/3] Fix openjdk build.

[Greg Hogan]

Replace en_US.utf8 locale with C.UTF-8.

The invalid phase reference in openjdk11 looks to be ignored on master.

Greg Hogan (3):
  gnu: icedtea-7: Fix build.
  gnu: openjdk9: Fix build.
  gnu: openjdk11: Fix build.

 gnu/packages/java.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


base-commit: 929cb4163fff2060a41afca16458e0594cfa0978
-- 
2.40.1

[bug#68575] [PATCH core-updates 1/3] gnu: icedtea-7: Fix build.

[Greg Hogan]

* gnu/packages/java.scm (icedtea-7)[arguments]: Use C.UTF-8 locale in
'install-keystore phase.

Change-Id: I6da65dd8aaea6fc95f7f0d269ed5ab45c26ce21d
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 5e910e9749..ce75c1cadb 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -577,8 +577,8 @@ (define (import-cert cert)
 
                  ;; This is necessary because the certificate directory contains
                  ;; files with non-ASCII characters in their names.
-                 (setlocale LC_ALL "en_US.utf8")
-                 (setenv "LC_ALL" "en_US.utf8")
+                 (setlocale LC_ALL "C.UTF-8")
+                 (setenv "LC_ALL" "C.UTF-8")
 
                  (for-each import-cert (find-files certs-dir "\\.pem$"))
                  (mkdir-p (string-append (assoc-ref outputs "out")
-- 
2.40.1

[bug#68575] [PATCH core-updates 2/3] gnu: openjdk9: Fix build.

[Greg Hogan]

* gnu/packages/java.scm (openjdk9)[arguments]: Use C.UTF-8 locale in
'install-keystore phase.

Change-Id: I7fb54b917a058584bcdee0fb5575b8eaba4f7edd
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index ce75c1cadb..9ff85355d5 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1032,8 +1032,8 @@ (define (import-cert cert)
 
                  ;; This is necessary because the certificate directory contains
                  ;; files with non-ASCII characters in their names.
-                 (setlocale LC_ALL "en_US.utf8")
-                 (setenv "LC_ALL" "en_US.utf8")
+                 (setlocale LC_ALL "C.UTF-8")
+                 (setenv "LC_ALL" "C.UTF-8")
 
                  (copy-file (string-append (assoc-ref outputs "out")
                                            "/lib/security/cacerts")
-- 
2.40.1

[bug#68575] [PATCH core-updates 3/3] gnu: openjdk11: Fix build.

[Greg Hogan]

* gnu/packages/java.scm (openjdk11)[arguments]: Replace reference to
'remove-diz-file phase with 'remove-extraneous-files.

Change-Id: I932be9202459b41d82686839d309d1785011bf90
---
 gnu/packages/java.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9ff85355d5..2efb435698 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1399,7 +1399,7 @@ (define (icedtea-or-openjdk? path)
                                            ((name . dir)
                                             dir))
                                          outputs)))))
-          (add-after 'remove-diz-file 'strip-archive-timestamps
+          (add-after 'remove-extraneous-files 'strip-archive-timestamps
             (lambda _
               (use-modules (ice-9 binary-ports)
                            (rnrs bytevectors))
-- 
2.40.1

bug#68575: [PATCH core-updates 0/3] Fix openjdk build.

[Maxim Cournoyer]

Hi,

Greg Hogan <code@greghogan.com> writes:

> Replace en_US.utf8 locale with C.UTF-8.
>
> The invalid phase reference in openjdk11 looks to be ignored on master.
>
> Greg Hogan (3):
>   gnu: icedtea-7: Fix build.
>   gnu: openjdk9: Fix build.
>   gnu: openjdk11: Fix build.

Applied to core-updates from 1f045d29c4 and up.

-- 
Thanks,
Maxim