guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

43/104: gnu: Add openjdk13.


From: guix-commits
Subject: 43/104: gnu: Add openjdk13.
Date: Sun, 17 May 2020 11:36:36 -0400 (EDT)

nckx pushed a commit to branch core-updates
in repository guix.

commit a85db160c6854ec5610c45c3e4f763be0869d450
Author: Not Zed <address@hidden>
AuthorDate: Tue Apr 28 10:33:46 2020 +0930

    gnu: Add openjdk13.
    
    * gnu/packages/java.scm (openjdk13): New variable.
    
    Signed-off-by: Ricardo Wurmus <address@hidden>
---
 gnu/packages/java.scm                          | 42 ++++++++++++++++++++++++++
 gnu/packages/patches/openjdk-14-builtins.patch | 11 +++++++
 2 files changed, 53 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c0ec683..2519b47 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2259,6 +2259,48 @@ new Date();"))
        ("zip" ,zip)))
     (home-page "https://openjdk.java.net/projects/jdk/12";)))
 
+(define-public openjdk13
+  (package
+    (inherit openjdk12)
+    (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|exe|jar)$"))
+                #t))))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("cups" ,cups)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("giflib" ,giflib)
+       ("lcms" ,lcms)
+       ("libjpeg" ,libjpeg-turbo)
+       ("libpng" ,libpng)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxrandr" ,libxrandr)
+       ("libxrender" ,libxrender)
+       ("libxt" ,libxt)
+       ("libxtst" ,libxtst)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("openjdk12:jdk" ,openjdk12 "jdk")
+       ("make@4.2" ,gnu-make-4.2)
+       ("pkg-config" ,pkg-config)
+       ("unzip" ,unzip)
+       ("which" ,which)
+       ("zip" ,zip)))
+    (home-page "https://openjdk.java.net/projects/jdk/13";)))
+
 (define-public icedtea icedtea-8)
 
 
diff --git a/gnu/packages/patches/openjdk-14-builtins.patch 
b/gnu/packages/patches/openjdk-14-builtins.patch
new file mode 100644
index 0000000..0e7e3dc
--- /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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]