From 86b73247503aa2cb7b0dd80f20ae550db32c506d Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 20 May 2021 09:56:18 +0200 Subject: leaving all intermedia java versions for now in build-support --- build-support/disabled/java/java8-openjdk/PKGBUILD | 318 --------------------- .../hotspot-jdk8u181-b13-readdir_r.patch | 25 -- .../java/java8-openjdk/install_jdk8-openjdk.sh | 50 ---- .../java8-openjdk/install_jre8-openjdk-headless.sh | 48 ---- .../java/java8-openjdk/install_jre8-openjdk.sh | 42 --- build-support/java8-openjdk/PKGBUILD | 318 +++++++++++++++++++++ .../hotspot-jdk8u181-b13-readdir_r.patch | 25 ++ .../java8-openjdk/install_jdk8-openjdk.sh | 50 ++++ .../java8-openjdk/install_jre8-openjdk-headless.sh | 48 ++++ .../java8-openjdk/install_jre8-openjdk.sh | 42 +++ 10 files changed, 483 insertions(+), 483 deletions(-) delete mode 100644 build-support/disabled/java/java8-openjdk/PKGBUILD delete mode 100644 build-support/disabled/java/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch delete mode 100644 build-support/disabled/java/java8-openjdk/install_jdk8-openjdk.sh delete mode 100644 build-support/disabled/java/java8-openjdk/install_jre8-openjdk-headless.sh delete mode 100644 build-support/disabled/java/java8-openjdk/install_jre8-openjdk.sh create mode 100644 build-support/java8-openjdk/PKGBUILD create mode 100644 build-support/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch create mode 100644 build-support/java8-openjdk/install_jdk8-openjdk.sh create mode 100644 build-support/java8-openjdk/install_jre8-openjdk-headless.sh create mode 100644 build-support/java8-openjdk/install_jre8-openjdk.sh diff --git a/build-support/disabled/java/java8-openjdk/PKGBUILD b/build-support/disabled/java/java8-openjdk/PKGBUILD deleted file mode 100644 index 94c724db..00000000 --- a/build-support/disabled/java/java8-openjdk/PKGBUILD +++ /dev/null @@ -1,318 +0,0 @@ -# Maintainer: Levente Polyak -# Maintainer: Guillaume ALAUX -# Contributor: Boyan Ding - -pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc') -pkgbase=java8-openjdk -_java_ver=8 -_jdk_update=292 -_jdk_build=10 -pkgver=${_java_ver}.u${_jdk_update} -_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} -pkgrel=1 -arch=(i486 i686 pentium4 'x86_64') -url='https://openjdk.java.net/' -license=('custom') -makedepends=('bin32-jdk7' 'ccache' 'cpio' 'unzip' 'zip' - 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib') -_url_src=https://hg.openjdk.java.net/jdk8u/jdk8u -source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz - corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz - hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz - jdk-${_repo_ver}.tar.gz::${_url_src}/jdk/archive/${_repo_ver}.tar.gz - jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz - jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz - langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz - nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz) - -sha256sums=('aba46c3c758b5fdedc812ce7d8ac46b45c3dfc2c51e41f9b23683d3ea4119d2b' - '55028874f71eda4bd170580885dd1bf707fd69c1e4a4af14175e6ac777ef5927' - '6a6be1e9d69d0bc8ca98b356e1150baae9e112241e3392c2adb6b30ec82864af' - '67f1c3a2c897c81bafb14327fcea249b9faac31a0b4d09321eae79847d4ea509' - '749073e9ba943a6fc87239d808463b05c804a5855fbc8c99fe9a090ae8cd07ef' - 'ca954d02629c43a0b553df75c1c7fe9cea31c428d99a9718a3e6860d684fb8a1' - 'e742f778cbdcb76b4dc593b9fed4bee26af91972096a265c1edb6d8e6ddf6fa3' - '1f335e8fb4ddff5786d1b65345daa4e525aa4ebcefe7e24bf5428b259e47c5d0') - -case "${CARCH}" in - 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; - 'i686' ) _JARCH=i386 ; _DOC_ARCH=x86 ;; -esac - -_jdkname=openjdk8 -_jvmdir=/usr/lib/jvm/java-8-openjdk -_prefix="jdk8u-${_repo_ver}/image" -_imgdir="${_prefix}/jvm/openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})" -_nonheadless=(bin/policytool - lib/${_JARCH}/libjsound.so - lib/${_JARCH}/libjsoundalsa.so - lib/${_JARCH}/libsplashscreen.so) - -prepare() { - cd jdk8u-${_repo_ver} - for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do - ln -s ../${subrepo}-${_repo_ver} ${subrepo} - done -} - -build() { - cd jdk8u-${_repo_ver} - -# unset JAVA_HOME - export JAVA_HOME=/usr/lib/jvm/java-7-jdk - - # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346 - export MAKEFLAGS=${MAKEFLAGS/-j*} - - # Avoid optimization of HotSpot being lowered from O3 to O2 - export CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS} -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon -Wno-error=format-overflow=" - export CXXFLAGS="${CXXFLAGS} ${CPPFLAGS} -fcommon" - - install -d -m 755 "${srcdir}/${_prefix}/" - sh configure \ - --prefix="${srcdir}/${_prefix}" \ - --with-update-version="${_jdk_update}" \ - --with-build-number="b${_jdk_build}" \ - --with-milestone="fcs" \ - --enable-unlimited-crypto \ - --with-zlib=system \ - --with-extra-cflags="${CFLAGS}" \ - --with-extra-cxxflags="${CXXFLAGS}" \ - --with-extra-ldflags="${LDFLAGS}" - - # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed) - #--with-giflib=system \ - - # These help to debug builds: LOG=trace HOTSPOT_BUILD_JOBS=1 - # Without 'DEBUG_BINARIES', i686 won't build: http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html - make - make docs - - # FIXME sadly 'DESTDIR' is not used here! - make install - - cd ../${_imgdir} - - # A lot of build stuff were directly taken from - # http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/tree/java-1.8.0-openjdk.spec - - # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 - find . -iname '*.jar' -exec chmod ugo+r {} \; - chmod ugo+r lib/ct.sym - - # remove redundant *diz and *debuginfo files - find . -iname '*.diz' -exec rm {} \; - find . -iname '*.debuginfo' -exec rm {} \; -} - -check() { - cd jdk8u-${_repo_ver} - #make -k test -} - -package_jre8-openjdk-headless() { - pkgdesc='OpenJDK Java 8 headless runtime environment' - depends=('java-runtime-common' 'ca-certificates-utils' 'nss') - optdepends=('java-rhino: for some JavaScript support') - provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8') - # Upstream config files that should go to etc and get backup - _backup_etc=(etc/java-8-openjdk/${_JARCH}/jvm.cfg - etc/java-8-openjdk/calendars.properties - etc/java-8-openjdk/content-types.properties - etc/java-8-openjdk/flavormap.properties - etc/java-8-openjdk/images/cursors/cursors.properties - etc/java-8-openjdk/logging.properties - etc/java-8-openjdk/management/jmxremote.access - etc/java-8-openjdk/management/jmxremote.password - etc/java-8-openjdk/management/management.properties - etc/java-8-openjdk/management/snmp.acl - etc/java-8-openjdk/net.properties - etc/java-8-openjdk/psfont.properties.ja - etc/java-8-openjdk/psfontj2d.properties - etc/java-8-openjdk/security/java.policy - etc/java-8-openjdk/security/java.security - etc/java-8-openjdk/sound.properties) - replaces=('jre8-openjdk-headless-wm') - backup=(${_backup_etc[@]}) - install=install_jre8-openjdk-headless.sh - - cd ${_imgdir}/jre - - install -d -m 755 "${pkgdir}${_jvmdir}/jre/" - cp -a bin lib "${pkgdir}${_jvmdir}/jre" - - # Set config files - mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,} - mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,} - - # Remove 'non-headless' lib files - for f in "${_nonheadless[@]}"; do - rm "${pkgdir}${_jvmdir}/jre/${f}" - done - - # Man pages - pushd "${pkgdir}${_jvmdir}/jre/bin" - install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ - for file in *; do - if [ -f "${srcdir}/${_imgdir}/man/man1/${file}.1" ]; then - install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ - "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" - fi - if [ -f "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" ]; then - install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ - "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" - fi - done - popd - - # Link JKS keystore from ca-certificates-utils - rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" - ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" - - # Install license - install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" - install -m 644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ - "${pkgdir}/usr/share/licenses/${pkgbase}" - ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" - - # Move config files that were set in _backup_etc from ./lib to /etc - for file in "${_backup_etc[@]}"; do - _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/} - install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}" - ln -sf /${file} "${pkgdir}${_filepkgpath}" - done -} - -package_jre8-openjdk() { - pkgdesc='OpenJDK Java 8 full runtime environment' - depends=("jre8-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme') - optdepends=('icedtea-web: web browser plugin + Java Web Start' - 'alsa-lib: for basic sound support' - 'gtk2: for the Gtk+ look and feel - desktop usage' - 'java8-openjfx: for JavaFX GUI components support') - provides=('java-runtime=8' 'java-runtime-openjdk=8') - install=install_jre8-openjdk.sh - replaces=('jre8-openjdk-wm') - - cd ${_imgdir}/jre - - for f in "${_nonheadless[@]}"; do - install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}" - done - - # Man pages - pushd "${pkgdir}${_jvmdir}/jre/bin" - install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ - for file in *; do - install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ - "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" - install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ - "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" - done - popd - - # Install license - install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" - ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" -} - -package_jdk8-openjdk() { - pkgdesc='OpenJDK Java 8 development kit' - depends=('java-environment-common' "jre8-openjdk=${pkgver}-${pkgrel}") - provides=('java-environment=8' 'java-environment-openjdk=8') - replaces=('jdk8-openjdk-wm') - install=install_jdk8-openjdk.sh - - cd ${_imgdir} - - # Main files - install -d -m 755 "${pkgdir}${_jvmdir}" - - cp -a include lib "${pkgdir}${_jvmdir}" - - # 'bin' files - pushd bin - - # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page - for b in $(ls | grep -v java-rmi.cgi); do - if [ -e ../jre/bin/${b} ]; then - # Provide a link of the jre binary in the jdk/bin/ directory - ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}" - else - # Copy binary to jdk/bin/ - install -D -m 755 ${b} "${pkgdir}${_jvmdir}/bin/${b}" - # Copy man page - if [ -f ../man/man1/${b}.1 ]; then - install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1" - fi - if [ -f ../man/ja/man1/${b}.1 ]; then - install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1" - fi - fi - done - popd - - # Handling 'java-rmi.cgi' separately - install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi" - - # link license - install -d -m 755 "${pkgdir}/usr/share/licenses/" - ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" -} - -package_openjdk8-src() { - pkgdesc='OpenJDK Java 8 sources' - - install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip" -} - -package_openjdk8-doc() { - pkgdesc='OpenJDK Java 8 documentation' - - install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/" - cp -r "${srcdir}"/jdk8u-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-server-release/docs/* \ - "${pkgdir}/usr/share/doc/${pkgbase}/" -} - -# vim: ts=2 sw=2 et: -eval "$( - declare -f build | \ - sed ' - s/-Wno-error=deprecated-declarations/-Wno-error=deprecated-declarations -Wno-error=deprecated/ - ' -)" - -eval "$( - declare -f package_jre8-openjdk-headless | \ - sed ' - s/^\s*rm\s/\0-f / - T - s/ -f -f / -f / - ' -)" - -# i486-specific -if [ "${CARCH}" = "i486" ]; then - _JARCH=i386 - _DOC_ARCH=x86 -fi - -# pentium4-specific -if [ "${CARCH}" = "pentium4" ]; then - _JARCH=i386 - _DOC_ARCH=x86 - - # force 4-byte stack alignment on SSE aptimized systems, see FS32#75 - eval "$( - declare -f build | \ - sed ' - s/\(export CFLAGS="\)/\1-mincoming-stack-boundary=2 / - s/\(export CXXFLAGS="\)/\1-mincoming-stack-boundary=2 / - ' - )" -fi - -_nonheadless=( - "${_nonheadless[@]/\/\///${_JARCH}/}" -) -_imgdir="${_imgdir//--/-${_JARCH}-}" diff --git a/build-support/disabled/java/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch b/build-support/disabled/java/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch deleted file mode 100644 index 2da9545c..00000000 --- a/build-support/disabled/java/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rauN hotspot-jdk8u181-b13/src/os/linux/vm/os_linux.inline.hpp hotspot-jdk8u181-b13-readdir_r-patch/src/os/linux/vm/os_linux.inline.hpp ---- hotspot-jdk8u181-b13/src/os/linux/vm/os_linux.inline.hpp 2018-07-04 03:01:40.000000000 +0200 -+++ hotspot-jdk8u181-b13-readdir_r-patch/src/os/linux/vm/os_linux.inline.hpp 2018-08-29 16:58:42.460758701 +0200 -@@ -117,18 +117,10 @@ - inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf) - { - dirent* p; -- int status; - assert(dirp != NULL, "just checking"); -- -- // NOTE: Linux readdir_r (on RH 6.2 and 7.2 at least) is NOT like the POSIX -- // version. Here is the doc for this function: -- // http://www.gnu.org/manual/glibc-2.2.3/html_node/libc_262.html -- -- if((status = ::readdir_r(dirp, dbuf, &p)) != 0) { -- errno = status; -- return NULL; -- } else -- return p; -+ -+ p = ::readdir(dirp); -+ return p; - } - - inline int os::closedir(DIR *dirp) { diff --git a/build-support/disabled/java/java8-openjdk/install_jdk8-openjdk.sh b/build-support/disabled/java/java8-openjdk/install_jdk8-openjdk.sh deleted file mode 100644 index faac8725..00000000 --- a/build-support/disabled/java/java8-openjdk/install_jdk8-openjdk.sh +++ /dev/null @@ -1,50 +0,0 @@ -THIS_JDK='java-8-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 - "" | ${THIS_JDK}/jre) - /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}" -o "x${default}" = "x${THIS_JDK}/jre" ]; 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 - /usr/bin/archlinux-java unset - if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then - /usr/bin/archlinux-java set ${THIS_JDK}/jre - fi - fi -} diff --git a/build-support/disabled/java/java8-openjdk/install_jre8-openjdk-headless.sh b/build-support/disabled/java/java8-openjdk/install_jre8-openjdk-headless.sh deleted file mode 100644 index 7a168097..00000000 --- a/build-support/disabled/java/java8-openjdk/install_jre8-openjdk-headless.sh +++ /dev/null @@ -1,48 +0,0 @@ -THIS_JRE='java-8-openjdk/jre' - -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} | ${THIS_JRE/\/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/\/jre}" = "x${THIS_JRE/\/jre}" ]; then - /usr/bin/archlinux-java unset - echo "No Java environment is set as default anymore" - fi -} diff --git a/build-support/disabled/java/java8-openjdk/install_jre8-openjdk.sh b/build-support/disabled/java/java8-openjdk/install_jre8-openjdk.sh deleted file mode 100644 index aef58588..00000000 --- a/build-support/disabled/java/java8-openjdk/install_jre8-openjdk.sh +++ /dev/null @@ -1,42 +0,0 @@ -THIS_JRE='java-8-openjdk/jre' - -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} | ${THIS_JRE/\/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 -} - -pre_remove() { - if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then - /usr/bin/archlinux-java unset - echo "No Java environment is set as default anymore" - fi -} diff --git a/build-support/java8-openjdk/PKGBUILD b/build-support/java8-openjdk/PKGBUILD new file mode 100644 index 00000000..94c724db --- /dev/null +++ b/build-support/java8-openjdk/PKGBUILD @@ -0,0 +1,318 @@ +# Maintainer: Levente Polyak +# Maintainer: Guillaume ALAUX +# Contributor: Boyan Ding + +pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc') +pkgbase=java8-openjdk +_java_ver=8 +_jdk_update=292 +_jdk_build=10 +pkgver=${_java_ver}.u${_jdk_update} +_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} +pkgrel=1 +arch=(i486 i686 pentium4 'x86_64') +url='https://openjdk.java.net/' +license=('custom') +makedepends=('bin32-jdk7' 'ccache' 'cpio' 'unzip' 'zip' + 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib') +_url_src=https://hg.openjdk.java.net/jdk8u/jdk8u +source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz + corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz + hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz + jdk-${_repo_ver}.tar.gz::${_url_src}/jdk/archive/${_repo_ver}.tar.gz + jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz + jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz + langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz + nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz) + +sha256sums=('aba46c3c758b5fdedc812ce7d8ac46b45c3dfc2c51e41f9b23683d3ea4119d2b' + '55028874f71eda4bd170580885dd1bf707fd69c1e4a4af14175e6ac777ef5927' + '6a6be1e9d69d0bc8ca98b356e1150baae9e112241e3392c2adb6b30ec82864af' + '67f1c3a2c897c81bafb14327fcea249b9faac31a0b4d09321eae79847d4ea509' + '749073e9ba943a6fc87239d808463b05c804a5855fbc8c99fe9a090ae8cd07ef' + 'ca954d02629c43a0b553df75c1c7fe9cea31c428d99a9718a3e6860d684fb8a1' + 'e742f778cbdcb76b4dc593b9fed4bee26af91972096a265c1edb6d8e6ddf6fa3' + '1f335e8fb4ddff5786d1b65345daa4e525aa4ebcefe7e24bf5428b259e47c5d0') + +case "${CARCH}" in + 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; + 'i686' ) _JARCH=i386 ; _DOC_ARCH=x86 ;; +esac + +_jdkname=openjdk8 +_jvmdir=/usr/lib/jvm/java-8-openjdk +_prefix="jdk8u-${_repo_ver}/image" +_imgdir="${_prefix}/jvm/openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})" +_nonheadless=(bin/policytool + lib/${_JARCH}/libjsound.so + lib/${_JARCH}/libjsoundalsa.so + lib/${_JARCH}/libsplashscreen.so) + +prepare() { + cd jdk8u-${_repo_ver} + for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do + ln -s ../${subrepo}-${_repo_ver} ${subrepo} + done +} + +build() { + cd jdk8u-${_repo_ver} + +# unset JAVA_HOME + export JAVA_HOME=/usr/lib/jvm/java-7-jdk + + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346 + export MAKEFLAGS=${MAKEFLAGS/-j*} + + # Avoid optimization of HotSpot being lowered from O3 to O2 + export CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS} -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon -Wno-error=format-overflow=" + export CXXFLAGS="${CXXFLAGS} ${CPPFLAGS} -fcommon" + + install -d -m 755 "${srcdir}/${_prefix}/" + sh configure \ + --prefix="${srcdir}/${_prefix}" \ + --with-update-version="${_jdk_update}" \ + --with-build-number="b${_jdk_build}" \ + --with-milestone="fcs" \ + --enable-unlimited-crypto \ + --with-zlib=system \ + --with-extra-cflags="${CFLAGS}" \ + --with-extra-cxxflags="${CXXFLAGS}" \ + --with-extra-ldflags="${LDFLAGS}" + + # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed) + #--with-giflib=system \ + + # These help to debug builds: LOG=trace HOTSPOT_BUILD_JOBS=1 + # Without 'DEBUG_BINARIES', i686 won't build: http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html + make + make docs + + # FIXME sadly 'DESTDIR' is not used here! + make install + + cd ../${_imgdir} + + # A lot of build stuff were directly taken from + # http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/tree/java-1.8.0-openjdk.spec + + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 + find . -iname '*.jar' -exec chmod ugo+r {} \; + chmod ugo+r lib/ct.sym + + # remove redundant *diz and *debuginfo files + find . -iname '*.diz' -exec rm {} \; + find . -iname '*.debuginfo' -exec rm {} \; +} + +check() { + cd jdk8u-${_repo_ver} + #make -k test +} + +package_jre8-openjdk-headless() { + pkgdesc='OpenJDK Java 8 headless runtime environment' + depends=('java-runtime-common' 'ca-certificates-utils' 'nss') + optdepends=('java-rhino: for some JavaScript support') + provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8') + # Upstream config files that should go to etc and get backup + _backup_etc=(etc/java-8-openjdk/${_JARCH}/jvm.cfg + etc/java-8-openjdk/calendars.properties + etc/java-8-openjdk/content-types.properties + etc/java-8-openjdk/flavormap.properties + etc/java-8-openjdk/images/cursors/cursors.properties + etc/java-8-openjdk/logging.properties + etc/java-8-openjdk/management/jmxremote.access + etc/java-8-openjdk/management/jmxremote.password + etc/java-8-openjdk/management/management.properties + etc/java-8-openjdk/management/snmp.acl + etc/java-8-openjdk/net.properties + etc/java-8-openjdk/psfont.properties.ja + etc/java-8-openjdk/psfontj2d.properties + etc/java-8-openjdk/security/java.policy + etc/java-8-openjdk/security/java.security + etc/java-8-openjdk/sound.properties) + replaces=('jre8-openjdk-headless-wm') + backup=(${_backup_etc[@]}) + install=install_jre8-openjdk-headless.sh + + cd ${_imgdir}/jre + + install -d -m 755 "${pkgdir}${_jvmdir}/jre/" + cp -a bin lib "${pkgdir}${_jvmdir}/jre" + + # Set config files + mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,} + mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,} + + # Remove 'non-headless' lib files + for f in "${_nonheadless[@]}"; do + rm "${pkgdir}${_jvmdir}/jre/${f}" + done + + # Man pages + pushd "${pkgdir}${_jvmdir}/jre/bin" + install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ + for file in *; do + if [ -f "${srcdir}/${_imgdir}/man/man1/${file}.1" ]; then + install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ + "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" + fi + if [ -f "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" ]; then + install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ + "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" + fi + done + popd + + # Link JKS keystore from ca-certificates-utils + rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" + + # Install license + install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" + install -m 644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ + "${pkgdir}/usr/share/licenses/${pkgbase}" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" + + # Move config files that were set in _backup_etc from ./lib to /etc + for file in "${_backup_etc[@]}"; do + _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/} + install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}" + ln -sf /${file} "${pkgdir}${_filepkgpath}" + done +} + +package_jre8-openjdk() { + pkgdesc='OpenJDK Java 8 full runtime environment' + depends=("jre8-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme') + optdepends=('icedtea-web: web browser plugin + Java Web Start' + 'alsa-lib: for basic sound support' + 'gtk2: for the Gtk+ look and feel - desktop usage' + 'java8-openjfx: for JavaFX GUI components support') + provides=('java-runtime=8' 'java-runtime-openjdk=8') + install=install_jre8-openjdk.sh + replaces=('jre8-openjdk-wm') + + cd ${_imgdir}/jre + + for f in "${_nonheadless[@]}"; do + install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}" + done + + # Man pages + pushd "${pkgdir}${_jvmdir}/jre/bin" + install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ + for file in *; do + install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ + "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" + install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ + "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" + done + popd + + # Install license + install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_jdk8-openjdk() { + pkgdesc='OpenJDK Java 8 development kit' + depends=('java-environment-common' "jre8-openjdk=${pkgver}-${pkgrel}") + provides=('java-environment=8' 'java-environment-openjdk=8') + replaces=('jdk8-openjdk-wm') + install=install_jdk8-openjdk.sh + + cd ${_imgdir} + + # Main files + install -d -m 755 "${pkgdir}${_jvmdir}" + + cp -a include lib "${pkgdir}${_jvmdir}" + + # 'bin' files + pushd bin + + # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page + for b in $(ls | grep -v java-rmi.cgi); do + if [ -e ../jre/bin/${b} ]; then + # Provide a link of the jre binary in the jdk/bin/ directory + ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}" + else + # Copy binary to jdk/bin/ + install -D -m 755 ${b} "${pkgdir}${_jvmdir}/bin/${b}" + # Copy man page + if [ -f ../man/man1/${b}.1 ]; then + install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1" + fi + if [ -f ../man/ja/man1/${b}.1 ]; then + install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1" + fi + fi + done + popd + + # Handling 'java-rmi.cgi' separately + install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi" + + # link license + install -d -m 755 "${pkgdir}/usr/share/licenses/" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_openjdk8-src() { + pkgdesc='OpenJDK Java 8 sources' + + install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip" +} + +package_openjdk8-doc() { + pkgdesc='OpenJDK Java 8 documentation' + + install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/" + cp -r "${srcdir}"/jdk8u-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-server-release/docs/* \ + "${pkgdir}/usr/share/doc/${pkgbase}/" +} + +# vim: ts=2 sw=2 et: +eval "$( + declare -f build | \ + sed ' + s/-Wno-error=deprecated-declarations/-Wno-error=deprecated-declarations -Wno-error=deprecated/ + ' +)" + +eval "$( + declare -f package_jre8-openjdk-headless | \ + sed ' + s/^\s*rm\s/\0-f / + T + s/ -f -f / -f / + ' +)" + +# i486-specific +if [ "${CARCH}" = "i486" ]; then + _JARCH=i386 + _DOC_ARCH=x86 +fi + +# pentium4-specific +if [ "${CARCH}" = "pentium4" ]; then + _JARCH=i386 + _DOC_ARCH=x86 + + # force 4-byte stack alignment on SSE aptimized systems, see FS32#75 + eval "$( + declare -f build | \ + sed ' + s/\(export CFLAGS="\)/\1-mincoming-stack-boundary=2 / + s/\(export CXXFLAGS="\)/\1-mincoming-stack-boundary=2 / + ' + )" +fi + +_nonheadless=( + "${_nonheadless[@]/\/\///${_JARCH}/}" +) +_imgdir="${_imgdir//--/-${_JARCH}-}" diff --git a/build-support/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch b/build-support/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch new file mode 100644 index 00000000..2da9545c --- /dev/null +++ b/build-support/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch @@ -0,0 +1,25 @@ +diff -rauN hotspot-jdk8u181-b13/src/os/linux/vm/os_linux.inline.hpp hotspot-jdk8u181-b13-readdir_r-patch/src/os/linux/vm/os_linux.inline.hpp +--- hotspot-jdk8u181-b13/src/os/linux/vm/os_linux.inline.hpp 2018-07-04 03:01:40.000000000 +0200 ++++ hotspot-jdk8u181-b13-readdir_r-patch/src/os/linux/vm/os_linux.inline.hpp 2018-08-29 16:58:42.460758701 +0200 +@@ -117,18 +117,10 @@ + inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf) + { + dirent* p; +- int status; + assert(dirp != NULL, "just checking"); +- +- // NOTE: Linux readdir_r (on RH 6.2 and 7.2 at least) is NOT like the POSIX +- // version. Here is the doc for this function: +- // http://www.gnu.org/manual/glibc-2.2.3/html_node/libc_262.html +- +- if((status = ::readdir_r(dirp, dbuf, &p)) != 0) { +- errno = status; +- return NULL; +- } else +- return p; ++ ++ p = ::readdir(dirp); ++ return p; + } + + inline int os::closedir(DIR *dirp) { diff --git a/build-support/java8-openjdk/install_jdk8-openjdk.sh b/build-support/java8-openjdk/install_jdk8-openjdk.sh new file mode 100644 index 00000000..faac8725 --- /dev/null +++ b/build-support/java8-openjdk/install_jdk8-openjdk.sh @@ -0,0 +1,50 @@ +THIS_JDK='java-8-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 + "" | ${THIS_JDK}/jre) + /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}" -o "x${default}" = "x${THIS_JDK}/jre" ]; 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 + /usr/bin/archlinux-java unset + if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then + /usr/bin/archlinux-java set ${THIS_JDK}/jre + fi + fi +} diff --git a/build-support/java8-openjdk/install_jre8-openjdk-headless.sh b/build-support/java8-openjdk/install_jre8-openjdk-headless.sh new file mode 100644 index 00000000..7a168097 --- /dev/null +++ b/build-support/java8-openjdk/install_jre8-openjdk-headless.sh @@ -0,0 +1,48 @@ +THIS_JRE='java-8-openjdk/jre' + +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} | ${THIS_JRE/\/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/\/jre}" = "x${THIS_JRE/\/jre}" ]; then + /usr/bin/archlinux-java unset + echo "No Java environment is set as default anymore" + fi +} diff --git a/build-support/java8-openjdk/install_jre8-openjdk.sh b/build-support/java8-openjdk/install_jre8-openjdk.sh new file mode 100644 index 00000000..aef58588 --- /dev/null +++ b/build-support/java8-openjdk/install_jre8-openjdk.sh @@ -0,0 +1,42 @@ +THIS_JRE='java-8-openjdk/jre' + +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} | ${THIS_JRE/\/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 +} + +pre_remove() { + if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then + /usr/bin/archlinux-java unset + echo "No Java environment is set as default anymore" + fi +} -- cgit v1.2.3-70-g09d2