[bug#40918] [PATCH] openjdk 14 package

[bug#40918] [PATCH] openjdk 14 package

[Michael Zucchi]

[-- Attachment #1.1: Type: text/plain, Size: 477 bytes --]


This mostly is just a simple copy of openjdk12 with changed links.  
openjdk13 is also included as it must be used to bootstrap openjdk14.

openjdk14 uses "help" as a rather poor choice of autoconf test for the 
availability of a shell builtin and this isn't available in 
bash-minimal, so a small patch is needed to make configure complete.  
I've contacted the openjdk developers with a suggested change but so far 
have had no response after a couple of business days.



[-- Attachment #1.2: Type: text/html, Size: 798 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-packages-java.scm-openjdk13-opnejdk14.patch --]
[-- Type: text/x-patch; name="0001-gnu-packages-java.scm-openjdk13-opnejdk14.patch", Size: 4642 bytes --]

From 7f8f90eea8c3eb9d104e7d9a865897f2456d14a3 Mon Sep 17 00:00:00 2001
From: Not Zed <notzed@gmail.com>
Date: Tue, 28 Apr 2020 10:33:46 +0930
Subject: [PATCH]         * gnu/packages/java.scm (openjdk13, opnejdk14)       
  * gnu/packages/patches/openjdk-14-builtins.patch: Added openjdk 13 and      
   14.

---
 gnu/packages/java.scm                         | 93 +++++++++++++++++++
 .../patches/openjdk-14-builtins.patch         | 11 +++
 2 files changed, 104 insertions(+)
 create mode 100644 gnu/packages/patches/openjdk-14-builtins.patch

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index cab90fb4e7..41c2e3c547 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2250,6 +2250,99 @@ new Date();"))
        ("zip" ,zip)))
     (home-page "https://openjdk.java.net/projects/jdk/12")))
 
+(define-public openjdk13
+  (package
+    (inherit openjdk11)
+    (name "openjdk")
+    (version "13.0")
+    (source (origin
+	     (method url-fetch)
+	     (uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2")
+	     (file-name (string-append name "-" version ".tar.bz2"))
+	     (sha256
+	      (base32
+	       "0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq"))
+	     (modules '((guix build utils)))
+	     (snippet
+	      `(begin
+		 (for-each delete-file (find-files "." ".*.bin$"))
+		 (for-each delete-file (find-files "." ".*.exe$"))
+		 (for-each delete-file (find-files "." ".*.jar$"))
+		 #t))))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("cups" ,cups)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("giflib" ,giflib)
+       ("lcms" ,lcms)
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxrandr" ,libxrandr)
+       ("libxrender" ,libxrender)
+       ("libxt" ,libxt)
+       ("libxtst" ,libxtst)))
+    ;; openjdk13 must be bootstrapped with java 12 or 13
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("openjdk12" ,openjdk11)
+       ("openjdk12:jdk" ,openjdk12 "jdk")
+       ("pkg-config" ,pkg-config)
+       ("unzip" ,unzip)
+       ("which" ,which)
+       ("zip" ,zip)))
+    (home-page "https://openjdk.java.net/projects/jdk/13")))
+
+(define-public openjdk14
+  (package
+    (inherit openjdk11)
+    (name "openjdk")
+    (version "14.0")
+    (source (origin
+	     (method url-fetch)
+	     (uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2")
+	     (file-name (string-append name "-" version ".tar.bz2"))
+	     (sha256
+	      (base32
+	       "0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch"))
+	     ;; openjdk14 autoconf uses 'help' to search for builtins, not available in bash-minimal
+	     (patches
+	      (search-patches "openjdk-14-builtins.patch"))
+	     (modules '((guix build utils)))
+	     (snippet
+	      `(begin
+		 (for-each delete-file (find-files "." ".*.bin$"))
+		 (for-each delete-file (find-files "." ".*.exe$"))
+		 (for-each delete-file (find-files "." ".*.jar$"))
+		 #t))))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("cups" ,cups)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("giflib" ,giflib)
+       ("lcms" ,lcms)
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxrandr" ,libxrandr)
+       ("libxrender" ,libxrender)
+       ("libxt" ,libxt)
+       ("libxtst" ,libxtst)))
+    ;; openjdk14 must be bootstrapped with java 13 or 14
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("openjdk13" ,openjdk11)
+       ("openjdk13:jdk" ,openjdk13 "jdk")
+       ("pkg-config" ,pkg-config)
+       ("unzip" ,unzip)
+       ("which" ,which)
+       ("zip" ,zip)))
+    (home-page "https://openjdk.java.net/projects/jdk/14")))
+
 (define-public icedtea icedtea-8)
 
 \f
diff --git a/gnu/packages/patches/openjdk-14-builtins.patch b/gnu/packages/patches/openjdk-14-builtins.patch
new file mode 100644
index 0000000000..0e7e3dcaa9
--- /dev/null
+++ b/gnu/packages/patches/openjdk-14-builtins.patch
@@ -0,0 +1,11 @@
+--- jdk14-bc54620a3848/make/autoconf/basics.m4	2020-02-07 04:40:54.000000000 +1030
++++ jdk14-bc54620a3848-new/make/autoconf/basics.m4	2020-04-24 10:59:33.056098506 +0930
+@@ -583,7 +583,7 @@
+   BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)])
+   if test "x[$]$1" = x; then
+     AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in])
+-    if help $2 > /dev/null 2>&1; then
++    if command -v $2 > /dev/null 2>&1; then
+       AC_MSG_NOTICE([Found $2 as shell built-in. Using it])
+       $1="$2"
+     else
-- 
2.26.2

[bug#40918] update

[Michael Zucchi]

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



Sorry I missed a response from openjdk about the requested config change 
so I will follow that up and create another patch once it has filtered 
through their system since that shouldn't need a config patch to work.



[-- Attachment #2: Type: text/html, Size: 481 bytes --]

[bug#40918] [PATCH] openjdk 14 package

[Björn Höfling]

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

On Tue, 28 Apr 2020 10:56:55 +0930
Michael Zucchi <notzed@gmail.com> wrote:

> 
> This mostly is just a simple copy of openjdk12 with changed links.  
> openjdk13 is also included as it must be used to bootstrap openjdk14.
> 
> openjdk14 uses "help" as a rather poor choice of autoconf test for
> the availability of a shell builtin and this isn't available in 
> bash-minimal, so a small patch is needed to make configure complete.  
> I've contacted the openjdk developers with a suggested change but so
> far have had no response after a couple of business days.
> 
> 

Hi Michael,

thank you for your patch.

When sending in the second version of your
patch, could you please split up the commits, having one distinct
commit per added/changed package.

Please update your commit message according to the Changelog-style. You
will find examples in the old commit logs, for example for how to add
the patch-file.

Excited to see your second version,

Björn


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

[bug#40918] [PATCH] openjdk 14 package

[Michael Zucchi]

On 29/4/20 8:08 am, Björn Höfling wrote:
> On Tue, 28 Apr 2020 10:56:55 +0930
> Michael Zucchi <notzed@gmail.com> wrote:
>
>> This mostly is just a simple copy of openjdk12 with changed links.
>> openjdk13 is also included as it must be used to bootstrap openjdk14.
>>
>> openjdk14 uses "help" as a rather poor choice of autoconf test for
>> the availability of a shell builtin and this isn't available in
>> bash-minimal, so a small patch is needed to make configure complete.
>> I've contacted the openjdk developers with a suggested change but so
>> far have had no response after a couple of business days.
>>
>>
> Hi Michael,
>
> thank you for your patch.
>
> When sending in the second version of your
> patch, could you please split up the commits, having one distinct
> commit per added/changed package.
>
> Please update your commit message according to the Changelog-style. You
> will find examples in the old commit logs, for example for how to add
> the patch-file.
>
> Excited to see your second version,
>
> Björn
>



I'm sorry i don't understand your second point, i used emacs changelog 
mode to create the commit message.

[bug#40918] [PATCH] openjdk 14 package

[Björn Höfling]

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

Hi Michael,

On Wed, 29 Apr 2020 09:17:22 +0930
Michael Zucchi <notzed@gmail.com> wrote:

> > Please update your commit message according to the Changelog-style.
> > You will find examples in the old commit logs, for example for how
> > to add the patch-file.

> I'm sorry i don't understand your second point, i used emacs
> changelog mode to create the commit message.

Let me try to explain that in more details. Guix is the pickiest
project I came along when it comes to commit messages. It took me a
while to get used to it. So please this shouldn't be a show-stopper for
you :-) In the end, a commiter can/will correct it.

Your git log consists of only one line:

* gnu/packages/java.scm (openjdk13, opnejdk14) * gnu/packages/patches/openjdk-14-builtins.patch: Added openjdk 13 and 14.

I would have expected something like:

----BEGIN EXAMPLE---
gnu: Add openjdk14.

* gnu/packages/java.scm (openjdk14): New variable.
* gnu/packages/patches/openjdk...patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
----END EXAMPLE---

So you really document every file you add, every variable/location
where you change something.

It is somewhat explained here, but at best look through older commits:

https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html#Submitting-Patches
https://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs

Hope this explains it better,

Björn

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

bug#40918: [PATCH] openjdk 14 package

[Ricardo Wurmus]

Hi Michael,

thank you for your contribution!

I’ve split the commit into two (one for each package addition), replaced
the patch with a substitution, simplified the snippet, removed unused
inputs, used libjpeg-turbo instead of libjpeg, and corrected the commit
message.

I’ve pushed the two commits to the master branch:

--8<---------------cut here---------------start------------->8---
commit 65a11a59de86fa759f2ffbb7db53430a6727c2ea
Author: Not Zed <notzed@gmail.com>

    gnu: Add openjdk14.
    
    * gnu/packages/java.scm (openjdk14): New variable.
    
    Signed-off-by: Ricardo Wurmus <rekado@elephly.net>

commit c4618174ecb6375849529f1d1026585817bb139e
Author: Not Zed <notzed@gmail.com>

    gnu: Add openjdk13.
    
    * gnu/packages/java.scm (openjdk13): New variable.
    
    Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
--8<---------------cut here---------------end--------------->8---

Thanks again!

-- 
Ricardo