[arch-commits] Commit in java-openjdk/repos (8 files)
Frederik Schwan
freswa at gemini.archlinux.org
Tue Apr 5 16:04:49 UTC 2022
Date: Tuesday, April 5, 2022 @ 16:04:49
Author: freswa
Revision: 441589
archrelease: copy trunk to testing-x86_64
Added:
java-openjdk/repos/testing-x86_64/
java-openjdk/repos/testing-x86_64/PKGBUILD
(from rev 441588, java-openjdk/trunk/PKGBUILD)
java-openjdk/repos/testing-x86_64/freedesktop-java.desktop
(from rev 441588, java-openjdk/trunk/freedesktop-java.desktop)
java-openjdk/repos/testing-x86_64/freedesktop-jconsole.desktop
(from rev 441588, java-openjdk/trunk/freedesktop-jconsole.desktop)
java-openjdk/repos/testing-x86_64/freedesktop-jshell.desktop
(from rev 441588, java-openjdk/trunk/freedesktop-jshell.desktop)
java-openjdk/repos/testing-x86_64/install_jdk-openjdk.sh
(from rev 441588, java-openjdk/trunk/install_jdk-openjdk.sh)
java-openjdk/repos/testing-x86_64/install_jre-openjdk-headless.sh
(from rev 441588, java-openjdk/trunk/install_jre-openjdk-headless.sh)
java-openjdk/repos/testing-x86_64/install_jre-openjdk.sh
(from rev 441588, java-openjdk/trunk/install_jre-openjdk.sh)
---------------------------------+
PKGBUILD | 290 ++++++++++++++++++++++++++++++++++++++
freedesktop-java.desktop | 12 +
freedesktop-jconsole.desktop | 11 +
freedesktop-jshell.desktop | 9 +
install_jdk-openjdk.sh | 50 ++++++
install_jre-openjdk-headless.sh | 48 ++++++
install_jre-openjdk.sh | 35 ++++
7 files changed, 455 insertions(+)
Copied: java-openjdk/repos/testing-x86_64/PKGBUILD (from rev 441588, java-openjdk/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2022-04-05 16:04:49 UTC (rev 441589)
@@ -0,0 +1,290 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Frederik Schwan <freswa at archlinux dot org>
+# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
+
+# TODO add test, see about packaging jtreg and using it here
+
+pkgbase=java-openjdk
+pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src' 'openjdk-doc')
+_majorver=18
+_minorver=0
+_securityver=0
+_updatever=0
+# pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+#pkgver=${_majorver}.u${_updatever}
+pkgver=${_majorver}
+pkgrel=1
+# _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+#_git_tag=jdk-${_majorver}+${_updatever}
+_git_tag=jdk-${_majorver}-ga
+arch=('x86_64')
+url='https://openjdk.java.net/'
+license=('custom')
+makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
+ 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
+ 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
+ 'libnet' 'bash' 'harfbuzz' 'gcc-libs' 'glibc')
+options=(!lto)
+source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz
+ freedesktop-java.desktop
+ freedesktop-jconsole.desktop
+ freedesktop-jshell.desktop)
+sha256sums=('d01149413acd484e9c098919d6e092a514a90cab45831e3832791556900c5b28'
+ '85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d'
+ 'abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7'
+ 'e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3')
+
+case "${CARCH}" in
+ x86_64) _JARCH='x86_64';;
+ i686) _JARCH='x86';;
+esac
+
+_jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk
+_jdkdir=jdk${_majorver}u-${_git_tag//+/-}
+_imgdir=${_jdkdir}/build/linux-${_JARCH}-server-release/images
+
+_nonheadless=(lib/libawt_xawt.{so,debuginfo}
+ lib/libjawt.{so,debuginfo}
+ lib/libjsound.{so,debuginfo}
+ lib/libsplashscreen.{so,debuginfo})
+
+build() {
+ cd ${_jdkdir}
+
+ NUM_PROC_OPT=''
+ MAKEFLAG_J=$(echo ${MAKEFLAGS} | sed -En 's/.*-j([0-9]+).*/\1/p')
+ if [ -n "${MAKEFLAG_J}" ]; then
+ # http://hg.openjdk.java.net/jdk10/jdk10/file/85e6cb013b98/make/InitSupport.gmk#l105
+ echo "Removing '-j${MAKEFLAG_J}' from MAKEFLAGS to prevent build fail. Passing it directly to ./configure."
+ export MAKEFLAGS=${MAKEFLAGS/-j${MAKEFLAG_J}/}
+ NUM_PROC_OPT="--with-num-cores=${MAKEFLAG_J}"
+ fi
+
+ # Avoid optimization of HotSpot to be lowered from O3 to O2
+ 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"
+ _CFLAGS=${CFLAGS/-fno-plt/}
+ _CXXFLAGS=${CXXFLAGS/-fno-plt/}
+ fi
+
+ # TODO: Should be rechecked for the next releases
+ # compiling with -fexceptions leads to:
+ # /usr/bin/ld: /build/java-openjdk/src/jdk17u-jdk-17.0.3-2/build/linux-x86_64-server-release/hotspot/variant-server/libjvm/objs/zPhysicalMemory.o: in function `ZList<ZMemory>::~ZList()':
+ # /build/java-openjdk/src/jdk17u-jdk-17.0.3-2/src/hotspot/share/gc/z/zList.hpp:54: undefined reference to `ZListNode<ZMemory>::~ZListNode()'
+ # collect2: error: ld returned 1 exit status
+ _CFLAGS=${CFLAGS/-fexceptions/}
+ _CXXFLAGS=${CXXFLAGS/-fexceptions/}
+
+ # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning
+ # in the output of ./configure unless used like such:
+ # --with-extra-cflags="${CFLAGS}"
+ # --with-extra-cxxflags="${CXXFLAGS}"
+ # --with-extra-ldflags="${LDFLAGS}"
+ # See also paragraph "Configure Control Variables from "jdk${_majorver}-${_git_tag}/common/doc/building.md
+ unset CFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+
+ bash configure \
+ --with-version-build="${_updatever}" \
+ --with-version-pre="" \
+ --with-version-opt="" \
+ --with-stdc++lib=dynamic \
+ --with-extra-cflags="${_CFLAGS}" \
+ --with-extra-cxxflags="${_CXXFLAGS}" \
+ --with-extra-ldflags="${_LDFLAGS}" \
+ --with-libjpeg=system \
+ --with-giflib=system \
+ --with-libpng=system \
+ --with-lcms=system \
+ --with-zlib=system \
+ --with-harfbuzz=system \
+ --with-jvm-features=zgc \
+ --enable-unlimited-crypto \
+ --disable-warnings-as-errors \
+ ${NUM_PROC_OPT}
+ #--disable-javac-server
+
+ make images legacy-jre-image docs
+
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \;
+}
+
+check() {
+ cd ${_jdkdir}
+ # TODO package jtreg
+ # make -k check
+}
+
+package_jre-openjdk-headless() {
+ pkgdesc="OpenJDK Java ${_majorver} headless runtime environment"
+ depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so'
+ 'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz' 'libharfbuzz.so'
+ 'glibc' 'gcc-libs')
+ optdepends=('java-rhino: for some JavaScript support')
+ provides=("java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
+ backup=(etc/${pkgbase}/logging.properties
+ etc/${pkgbase}/management/jmxremote.access
+ etc/${pkgbase}/management/jmxremote.password.template
+ etc/${pkgbase}/management/management.properties
+ etc/${pkgbase}/net.properties
+ etc/${pkgbase}/security/java.policy
+ etc/${pkgbase}/security/java.security
+ etc/${pkgbase}/security/policy/README.txt
+ etc/${pkgbase}/security/policy/limited/default_US_export.policy
+ etc/${pkgbase}/security/policy/limited/default_local.policy
+ etc/${pkgbase}/security/policy/limited/exempt_local.policy
+ etc/${pkgbase}/security/policy/unlimited/default_US_export.policy
+ etc/${pkgbase}/security/policy/unlimited/default_local.policy
+ etc/${pkgbase}/sound.properties)
+ install=install_jre-openjdk-headless.sh
+
+ cd ${_imgdir}/jre
+
+ install -dm 755 "${pkgdir}${_jvmdir}"
+
+ cp -a bin lib \
+ "${pkgdir}${_jvmdir}"
+
+ for f in "${_nonheadless[@]}"; do
+ rm "${pkgdir}${_jvmdir}/${f}"
+ done
+
+ cp ../jdk/release "${pkgdir}${_jvmdir}"
+ cp ../jdk/lib/modules "${pkgdir}${_jvmdir}/lib"
+
+ # Conf
+ install -dm 755 "${pkgdir}/etc"
+ cp -r conf "${pkgdir}/etc/${pkgbase}"
+ ln -s /etc/${pkgbase} "${pkgdir}/${_jvmdir}/conf"
+
+ # Legal
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
+ ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+ ln -s /usr/share/licenses/${pkgbase} "${pkgdir}/${_jvmdir}/legal"
+
+ # Man pages
+ for f in bin/*; do
+ f=$(basename "${f}")
+ _man=../jdk/man/man1/"${f}.1"
+ test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
+ done
+ ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
+
+ # Link JKS keystore from ca-certificates-utils
+ rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
+ ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
+}
+
+package_jre-openjdk() {
+ pkgdesc="OpenJDK Java ${_majorver} full runtime environment"
+ depends=("jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}" 'giflib' 'libgif.so'
+ 'glibc' 'gcc-libs' 'libpng')
+ optdepends=('alsa-lib: for basic sound support'
+ 'gtk2: for the Gtk+ 2 look and feel - desktop usage'
+ 'gtk3: for the Gtk+ 3 look and feel - desktop usage')
+ provides=("java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}")
+ install=install_jre-openjdk.sh
+
+ cd ${_imgdir}/jre
+
+ install -dm 755 "${pkgdir}${_jvmdir}"
+
+ for f in "${_nonheadless[@]}"; do
+ install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}"
+ done
+
+ # Licenses
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_jdk-openjdk() {
+ pkgdesc="OpenJDK Java ${_majorver} development kit"
+ depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3'
+ 'hicolor-icon-theme' 'libelf' 'glibc' 'gcc-libs')
+ provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+ install=install_jdk-openjdk.sh
+
+ cd ${_imgdir}/jdk
+
+ install -dm 755 "${pkgdir}${_jvmdir}"
+
+ cp -a bin demo include jmods lib \
+ "${pkgdir}${_jvmdir}"
+
+ rm "${pkgdir}${_jvmdir}/lib/src.zip"
+
+ # Remove files held by JRE
+ pushd ../jre
+ for d in bin lib; do
+ find ${d} ! -type d -exec rm "${pkgdir}${_jvmdir}/{}" \;
+ done
+ popd
+ find "${pkgdir}${_jvmdir}/lib" -type d -empty -delete
+
+ # Conf files all belong to JRE
+
+ # Legal
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
+ pushd ../jre/legal
+ find . ! -type d -exec rm "${pkgdir}/usr/share/licenses/${pkgbase}/{}" \;
+ popd
+ find "${pkgdir}/usr/share/licenses" -type d -empty -delete
+ ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ # Man pages
+ for f in bin/*; do
+ f=$(basename "${f}")
+ _man=man/man1/"${f}.1"
+ test -f "../jre/bin/${f}" && continue
+ test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
+ done
+
+ # Icons
+ for s in 16 24 32 48; do
+ install -Dm 644 \
+ "${srcdir}/${_jdkdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png" \
+ "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/${pkgbase}.png"
+ done
+
+ # Desktop files
+ for f in jconsole java jshell; do
+ install -Dm 644 \
+ "${srcdir}/freedesktop-${f}.desktop" \
+ "${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop"
+ done
+}
+
+package_openjdk-src() {
+ pkgdesc="OpenJDK Java ${_majorver} sources"
+ # Depends on JDK to get license files
+ depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+ provides=("openjdk${_majorver}-src=${pkgver}-${pkgrel}")
+
+ install -Dm 644 -t "${pkgdir}${_jvmdir}/lib" ${_imgdir}/jdk/lib/src.zip
+
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_openjdk-doc() {
+ pkgdesc="OpenJDK Java ${_majorver} documentation"
+ # Depends on JDK to get license files
+ depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+ provides=("openjdk${_majorver}-doc=${pkgver}-${pkgrel}")
+
+ install -dm 755 "${pkgdir}/usr/share/doc"
+ cp -r ${_imgdir}/docs "${pkgdir}/usr/share/doc/${pkgbase}"
+
+ install -dm 755 "${pkgdir}/usr/share/licenses"
+ ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+# vim: ts=2 sw=2 et:
Copied: java-openjdk/repos/testing-x86_64/freedesktop-java.desktop (from rev 441588, java-openjdk/trunk/freedesktop-java.desktop)
===================================================================
--- testing-x86_64/freedesktop-java.desktop (rev 0)
+++ testing-x86_64/freedesktop-java.desktop 2022-04-05 16:04:49 UTC (rev 441589)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=OpenJDK Java 17 Runtime
+Name[fi]=OpenJDK Java 17 - ajonaikainen ympäristö
+Comment=OpenJDK Java 17 Runtime
+Comment[fi]=OpenJDK Java 17 - ajonaikainen ympäristö
+Keywords=java;runtime
+Exec=/usr/lib/jvm/java-17-openjdk/bin/java -jar
+Terminal=false
+Type=Application
+Icon=java17-openjdk
+MimeType=application/x-java-archive;application/java-archive;application/x-jar;
+NoDisplay=true
Copied: java-openjdk/repos/testing-x86_64/freedesktop-jconsole.desktop (from rev 441588, java-openjdk/trunk/freedesktop-jconsole.desktop)
===================================================================
--- testing-x86_64/freedesktop-jconsole.desktop (rev 0)
+++ testing-x86_64/freedesktop-jconsole.desktop 2022-04-05 16:04:49 UTC (rev 441589)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=OpenJDK Java 17 Console
+Name[fi]=OpenJDK Java 17 - konsoli
+Comment=OpenJDK Java 17 Monitoring & Management Console
+Comment[fi]=OpenJDK Java 17 - valvonta- ja hallintakonsoli
+Keywords=java;console;monitoring
+Exec=/usr/lib/jvm/java-17-openjdk/bin/jconsole
+Terminal=false
+Type=Application
+Icon=java17-openjdk
+Categories=Application;System;
Copied: java-openjdk/repos/testing-x86_64/freedesktop-jshell.desktop (from rev 441588, java-openjdk/trunk/freedesktop-jshell.desktop)
===================================================================
--- testing-x86_64/freedesktop-jshell.desktop (rev 0)
+++ testing-x86_64/freedesktop-jshell.desktop 2022-04-05 16:04:49 UTC (rev 441589)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=OpenJDK Java 17 Shell
+Comment=OpenJDK Java 17 Shell
+Keywords=java;shell
+Exec=/usr/lib/jvm/java-17-openjdk/bin/jshell
+Terminal=true
+Type=Application
+Icon=java17-openjdk
+Categories=Application;System;
Copied: java-openjdk/repos/testing-x86_64/install_jdk-openjdk.sh (from rev 441588, java-openjdk/trunk/install_jdk-openjdk.sh)
===================================================================
--- testing-x86_64/install_jdk-openjdk.sh (rev 0)
+++ testing-x86_64/install_jdk-openjdk.sh 2022-04-05 16:04:49 UTC (rev 441589)
@@ -0,0 +1,50 @@
+THIS_JDK='java-17-openjdk'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JDK}
+ ;;
+ ${THIS_JDK})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+post_upgrade() {
+ default=$(fix_default)
+ if [ -z "${default}" ]; then
+ /usr/bin/archlinux-java set ${THIS_JDK}
+ fi
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+pre_remove() {
+ if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
+ # Check JRE is still available
+ if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ fi
+ fi
+}
Copied: java-openjdk/repos/testing-x86_64/install_jre-openjdk-headless.sh (from rev 441588, java-openjdk/trunk/install_jre-openjdk-headless.sh)
===================================================================
--- testing-x86_64/install_jre-openjdk-headless.sh (rev 0)
+++ testing-x86_64/install_jre-openjdk-headless.sh 2022-04-05 16:04:49 UTC (rev 441589)
@@ -0,0 +1,48 @@
+THIS_JRE='java-17-openjdk'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ ;;
+ ${THIS_JRE})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+post_upgrade() {
+ if [ -z "$(fix_default)" ]; then
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ fi
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+pre_remove() {
+ default=$(fix_default)
+ if [ "x${default}" = "x${THIS_JRE}" ]; then
+ /usr/bin/archlinux-java unset
+ echo "No Java environment is set as default anymore"
+ fi
+}
Copied: java-openjdk/repos/testing-x86_64/install_jre-openjdk.sh (from rev 441588, java-openjdk/trunk/install_jre-openjdk.sh)
===================================================================
--- testing-x86_64/install_jre-openjdk.sh (rev 0)
+++ testing-x86_64/install_jre-openjdk.sh 2022-04-05 16:04:49 UTC (rev 441589)
@@ -0,0 +1,35 @@
+THIS_JRE='java-17-openjdk'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ ;;
+ ${THIS_JRE})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ echo "when you use a non-reparenting window manager,"
+ echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
+}
+
+post_upgrade() {
+ if [ -z "$(fix_default)" ]; then
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ fi
+}
More information about the arch-commits
mailing list