summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD13
-rw-r--r--fix-jdk-version-detection.patch13
3 files changed, 28 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d4f310ffe2d..d3a1b14030f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = java8-openjdk
pkgver = 8.u172
- pkgrel = 2
+ pkgrel = 3
url = http://openjdk.java.net/
arch = x86_64
arch = i686
@@ -25,6 +25,7 @@ pkgbase = java8-openjdk
source = nashorn-jdk8u172-b11.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u172-b11.tar.gz
source = add-fontconfig.patch
source = enable-infinality.patch
+ source = fix-jdk-version-detection.patch
sha256sums = f1ca31605360594cb57b21aa5888f253e9775125957f96afb1a9dbb71676af22
sha256sums = a89b558a4bb1d0368486a58d248a16b1760f8536fdc94ff70bf09e5c1bfcea24
sha256sums = f7a2652021b50d43c076df8f94cec13b82e2704c0d1535289074cb5e0eec31a0
@@ -35,6 +36,7 @@ pkgbase = java8-openjdk
sha256sums = 2a3bff4dfca022cb603cd46a6766fd1b7212adb473af5809b48504576bce6029
sha256sums = 3e67013b249fe702b0176e5d39f7ddef85ef0df121ef0b3a898ea82772712f55
sha256sums = efeee8db0710bc217b5e886224450f6cf50938004e8c140eb9aee0a699d2d5ac
+ sha256sums = b8a81344757e816c9ae0a74a523941c2a259dfa8c1eba5698f73f88a623a70d2
pkgname = jre8-openjdk-headless-infinality
pkgdesc = OpenJDK Java 8 headless runtime environment with infinality patch applied
@@ -52,7 +54,7 @@ pkgname = jre8-openjdk-headless-infinality
pkgname = jre8-openjdk-infinality
pkgdesc = OpenJDK Java 8 full runtime environment with infinality patch applied
install = install_jre8-openjdk.sh
- depends = jre8-openjdk-headless-infinality=8.u172-2
+ depends = jre8-openjdk-headless-infinality=8.u172-3
depends = xdg-utils
depends = hicolor-icon-theme
optdepends = icedtea-web: web browser plugin + Java Web Start
@@ -68,7 +70,7 @@ pkgname = jdk8-openjdk-infinality
pkgdesc = OpenJDK Java 8 development kit with infinality patch applied
install = install_jdk8-openjdk.sh
depends = java-environment-common
- depends = jre8-openjdk-infinality=8.u172-2
+ depends = jre8-openjdk-infinality=8.u172-3
provides = java-environment=8
provides = java-environment-openjdk=8
conflicts = jdk8-openjdk
diff --git a/PKGBUILD b/PKGBUILD
index 21ebf180ffa..1c878c371a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _jdk_update=172
_jdk_build=11
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=2
+pkgrel=3
arch=('x86_64' 'i686')
url='http://openjdk.java.net/'
license=('custom')
@@ -34,7 +34,8 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/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
add-fontconfig.patch
- enable-infinality.patch)
+ enable-infinality.patch
+ fix-jdk-version-detection.patch)
sha256sums=('f1ca31605360594cb57b21aa5888f253e9775125957f96afb1a9dbb71676af22'
'a89b558a4bb1d0368486a58d248a16b1760f8536fdc94ff70bf09e5c1bfcea24'
@@ -45,7 +46,8 @@ sha256sums=('f1ca31605360594cb57b21aa5888f253e9775125957f96afb1a9dbb71676af22'
'ef0f2042143cf6ddc508d81978fdb7cd900d38e5b166f40112d1967ceb09f036'
'2a3bff4dfca022cb603cd46a6766fd1b7212adb473af5809b48504576bce6029'
'3e67013b249fe702b0176e5d39f7ddef85ef0df121ef0b3a898ea82772712f55'
- 'efeee8db0710bc217b5e886224450f6cf50938004e8c140eb9aee0a699d2d5ac')
+ 'efeee8db0710bc217b5e886224450f6cf50938004e8c140eb9aee0a699d2d5ac'
+ 'b8a81344757e816c9ae0a74a523941c2a259dfa8c1eba5698f73f88a623a70d2')
case "${CARCH}" in
'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -73,6 +75,11 @@ prepare() {
cd "${srcdir}/jdk8u-${_repo_ver}/jdk"
patch -p1 < "${srcdir}/add-fontconfig.patch"
patch -p1 < "${srcdir}/enable-infinality.patch"
+
+ # Fix _JAVA_OPTIONS in environment breaking JDK version detection during configure.
+ cd "${srcdir}/jdk8u-${_repo_ver}"
+ patch -p1 < "${srcdir}/fix-jdk-version-detection.patch"
+ sh common/autoconf/autogen.sh
}
build() {
diff --git a/fix-jdk-version-detection.patch b/fix-jdk-version-detection.patch
new file mode 100644
index 00000000000..fbe526976e1
--- /dev/null
+++ b/fix-jdk-version-detection.patch
@@ -0,0 +1,13 @@
+diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4
+index ace6f7d..c13cde7 100644
+--- a/common/autoconf/boot-jdk.m4
++++ b/common/autoconf/boot-jdk.m4
+@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -F version`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`]