From 596df37da07d7d5a210cc36fc122aaf7827b7b15 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Tue, 18 May 2021 21:03:33 +0200 Subject: removed some old java version (which are in build-support now for bootstrapping) --- extra/java7-openjdk/PKGBUILD | 15 -------- extra/java8-openjdk/PKGBUILD | 41 ---------------------- .../hotspot-jdk8u181-b13-readdir_r.patch | 25 ------------- 3 files changed, 81 deletions(-) delete mode 100644 extra/java7-openjdk/PKGBUILD delete mode 100644 extra/java8-openjdk/PKGBUILD delete mode 100644 extra/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD deleted file mode 100644 index 15f3c428..00000000 --- a/extra/java7-openjdk/PKGBUILD +++ /dev/null @@ -1,15 +0,0 @@ -# i486-specific -if [ "${CARCH}" = "i486" ]; then - _JARCH=i386 -fi - -# pentium4-specific -if [ "${CARCH}" = "pentium4" ]; then - _JARCH=i386 - _DOC_ARCH=x86 -fi - -_nonheadless=( - "${_nonheadless[@]/\/\///${_JARCH}/}" -) -_imgdir="${_imgdir//--/-${_JARCH}-}" diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD deleted file mode 100644 index a8553565..00000000 --- a/extra/java8-openjdk/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -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/extra/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch b/extra/java8-openjdk/hotspot-jdk8u181-b13-readdir_r.patch deleted file mode 100644 index 2da9545c..00000000 --- a/extra/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) { -- cgit v1.2.3