mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/java-openjdk to 14.0.1.u7-1
This commit is contained in:
Kevin Mihelich
parent
c1eabf9d42
commit
6fe10fb16b
7 changed files with 37 additions and 29 deletions
|
|
@ -20,10 +20,10 @@
|
|||
|
||||
pkgbase=java-openjdk
|
||||
pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src')
|
||||
_majorver=13
|
||||
_majorver=14
|
||||
_minorver=0
|
||||
_securityver=2
|
||||
_updatever=8
|
||||
_securityver=1
|
||||
_updatever=7
|
||||
pkgrel=1
|
||||
pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
|
||||
_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
|
||||
|
|
@ -37,11 +37,13 @@ makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'lib
|
|||
source=(https://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz
|
||||
freedesktop-java.desktop
|
||||
freedesktop-jconsole.desktop
|
||||
freedesktop-jshell.desktop)
|
||||
sha256sums=('d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0'
|
||||
'4edd8475037062cdff87993c1745ddb6df31f49e76c2774bca3841da70675580'
|
||||
'd759e5e360abe9fae7b5f87498f81dd786aa568aa997d0cb8ba3e75fa0c364dd'
|
||||
'939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc')
|
||||
freedesktop-jshell.desktop
|
||||
java-openjdk-make-4.3.patch::https://hg.openjdk.java.net/jdk/jdk/raw-rev/0743e1d49930)
|
||||
sha256sums=('301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4'
|
||||
'165273caba29f70496e697c9ed5bf61a4322ab324888f78559820f0032df48c9'
|
||||
'1e3decf29075b6f62238a5b2ac537679f00c185ce36d83db254004237cfe7084'
|
||||
'676c74c8aed53d6cd4c4755ece2b2e3ab1a72b1bd2ef53983dcad0229d91af3c'
|
||||
'c92e82183318afe9fdb621c238becba3e03cdc83ced714e871855fa1dc252f66')
|
||||
|
||||
case "${CARCH}" in
|
||||
x86_64) _JARCH='x86_64';;
|
||||
|
|
@ -63,6 +65,12 @@ _nonheadless=(lib/libawt_xawt.{so,debuginfo}
|
|||
lib/libjsound.{so,debuginfo}
|
||||
lib/libsplashscreen.{so,debuginfo})
|
||||
|
||||
prepare() {
|
||||
cd ${_jdkdir}
|
||||
# https://bugs.openjdk.java.net/browse/JDK-8237879
|
||||
patch -Np1 < "${srcdir}/java-openjdk-make-4.3.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${_jdkdir}
|
||||
|
||||
|
|
@ -78,8 +86,8 @@ build() {
|
|||
fi
|
||||
|
||||
# Avoid optimization of HotSpot to be lowered from O3 to O2
|
||||
local _CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS}"
|
||||
local _CXXFLAGS="${CXXFLAGS//-O2/-O3} ${CPPFLAGS}"
|
||||
local _CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon"
|
||||
local _CXXFLAGS="${CXXFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon"
|
||||
local _LDFLAGS=${LDFLAGS}
|
||||
if [[ ${CARCH} = i686 ]]; then
|
||||
echo "Removing '-fno-plt' from CFLAGS and CXXFLAGS to prevent build fail with this architecture"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
[Desktop Entry]
|
||||
Name=OpenJDK Java 13 Runtime
|
||||
Name[fi]=OpenJDK Java 13 - ajonaikainen ympäristö
|
||||
Comment=OpenJDK Java 13 Runtime
|
||||
Comment[fi]=OpenJDK Java 13 - ajonaikainen ympäristö
|
||||
Name=OpenJDK Java 14 Runtime
|
||||
Name[fi]=OpenJDK Java 14 - ajonaikainen ympäristö
|
||||
Comment=OpenJDK Java 14 Runtime
|
||||
Comment[fi]=OpenJDK Java 14 - ajonaikainen ympäristö
|
||||
Keywords=java;runtime
|
||||
Exec=/usr/lib/jvm/java-13-openjdk/bin/java -jar
|
||||
Exec=/usr/lib/jvm/java-14-openjdk/bin/java -jar
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Icon=java13-openjdk
|
||||
Icon=java14-openjdk
|
||||
MimeType=application/x-java-archive;application/java-archive;application/x-jar;
|
||||
NoDisplay=true
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
[Desktop Entry]
|
||||
Name=OpenJDK Java 13 Console
|
||||
Name[fi]=OpenJDK Java 13 - konsoli
|
||||
Comment=OpenJDK Java 13 Monitoring & Management Console
|
||||
Comment[fi]=OpenJDK Java 13 - valvonta- ja hallintakonsoli
|
||||
Name=OpenJDK Java 14 Console
|
||||
Name[fi]=OpenJDK Java 14 - konsoli
|
||||
Comment=OpenJDK Java 14 Monitoring & Management Console
|
||||
Comment[fi]=OpenJDK Java 14 - valvonta- ja hallintakonsoli
|
||||
Keywords=java;console;monitoring
|
||||
Exec=/usr/lib/jvm/java-13-openjdk/bin/jconsole
|
||||
Exec=/usr/lib/jvm/java-14-openjdk/bin/jconsole
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Icon=java13-openjdk
|
||||
Icon=java14-openjdk
|
||||
Categories=Application;System;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[Desktop Entry]
|
||||
Name=OpenJDK Java 13 Shell
|
||||
Comment=OpenJDK Java 13 Shell
|
||||
Name=OpenJDK Java 14 Shell
|
||||
Comment=OpenJDK Java 14 Shell
|
||||
Keywords=java;shell
|
||||
Exec=/usr/lib/jvm/java-13-openjdk/bin/jshell
|
||||
Exec=/usr/lib/jvm/java-14-openjdk/bin/jshell
|
||||
Terminal=true
|
||||
Type=Application
|
||||
Icon=java13-openjdk
|
||||
Icon=java14-openjdk
|
||||
Categories=Application;System;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
THIS_JDK='java-13-openjdk'
|
||||
THIS_JDK='java-14-openjdk'
|
||||
|
||||
fix_default() {
|
||||
if [ ! -x /usr/bin/java ]; then
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
THIS_JRE='java-13-openjdk'
|
||||
THIS_JRE='java-14-openjdk'
|
||||
|
||||
fix_default() {
|
||||
if [ ! -x /usr/bin/java ]; then
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
THIS_JRE='java-13-openjdk'
|
||||
THIS_JRE='java-14-openjdk'
|
||||
|
||||
fix_default() {
|
||||
if [ ! -x /usr/bin/java ]; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue