[arch-commits] Commit in java8-openjdk/trunk (3 files)
Date: Sunday, August 23, 2015 @ 21:11:34
Author: guillaume
Revision: 244747
Upstream release 8.u60-1
Modified:
java8-openjdk/trunk/PKGBUILD
Deleted:
java8-openjdk/trunk/JDK-8074312-hotspot.patch
java8-openjdk/trunk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
+
JDK-8074312-hotspot.patch |
12 --
JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch |
46 --
PKGBUILD |
36 ++-
3 files changed, 13 insertions(+), 81 deletions(-)
Deleted: JDK-8074312-hotspot.patch
===
--- JDK-8074312-hotspot.patch 2015-08-23 18:52:41 UTC (rev 244746)
+++ JDK-8074312-hotspot.patch 2015-08-23 19:11:34 UTC (rev 244747)
@@ -1,12 +0,0 @@
-diff -r 61edd5c7412e make/linux/Makefile
a/make/linux/Makefile Mon Mar 02 18:12:06 2015 +
-+++ b/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100
-@@ -233,7 +233,7 @@
- # Solaris 2.5.1, 2.6).
- # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
-
--SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
-+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
- OS_VERSION := $(shell uname -r)
- EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
-
Deleted:
JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
===
--- JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
2015-08-23 18:52:41 UTC (rev 244746)
+++ JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
2015-08-23 19:11:34 UTC (rev 244747)
@@ -1,46 +0,0 @@
-
-# HG changeset patch
-# User sgehwolf
-# Date 1430335428 25200
-# Node ID 2a55e4998f0d28c7003a8a0f43d2c7602d89f54b
-# Parent cd8fe1a9205aedb6b5a1fc16e664412e48aee565
-8078666: JVM fastdebug build compiled with GCC 5 asserts with widen increases
-Summary: do the math on the unsigned type where overflows are well defined
-Reviewed-by: kvn, aph
-
-diff -r cd8fe1a9205a -r 2a55e4998f0d src/share/vm/opto/type.cpp
a/src/share/vm/opto/type.cpp Wed Jun 10 20:15:29 2015 -0400
-+++ b/src/share/vm/opto/type.cpp Wed Apr 29 12:23:48 2015 -0700
-@@ -1180,11 +1180,11 @@
- // Certain normalizations keep us sane when comparing types.
- // The 'SMALLINT' covers constants and also CC and its relatives.
- if (lo = hi) {
--if ((juint)(hi - lo) = SMALLINT) w = Type::WidenMin;
--if ((juint)(hi - lo) = max_juint) w = Type::WidenMax; // TypeInt::INT
-+if (((juint)hi - lo) = SMALLINT) w = Type::WidenMin;
-+if (((juint)hi - lo) = max_juint) w = Type::WidenMax; // TypeInt::INT
- } else {
--if ((juint)(lo - hi) = SMALLINT) w = Type::WidenMin;
--if ((juint)(lo - hi) = max_juint) w = Type::WidenMin; // dual
TypeInt::INT
-+if (((juint)lo - hi) = SMALLINT) w = Type::WidenMin;
-+if (((juint)lo - hi) = max_juint) w = Type::WidenMin; // dual
TypeInt::INT
- }
- return w;
- }
-@@ -1438,11 +1438,11 @@
- // Certain normalizations keep us sane when comparing types.
- // The 'SMALLINT' covers constants.
- if (lo = hi) {
--if ((julong)(hi - lo) = SMALLINT) w = Type::WidenMin;
--if ((julong)(hi - lo) = max_julong) w = Type::WidenMax; // TypeLong::LONG
-+if (((julong)hi - lo) = SMALLINT) w = Type::WidenMin;
-+if (((julong)hi - lo) = max_julong) w = Type::WidenMax; // TypeLong::LONG
- } else {
--if ((julong)(lo - hi) = SMALLINT) w = Type::WidenMin;
--if ((julong)(lo - hi) = max_julong) w = Type::WidenMin; // dual
TypeLong::LONG
-+if (((julong)lo - hi) = SMALLINT) w = Type::WidenMin;
-+if (((julong)lo - hi) = max_julong) w = Type::WidenMin; // dual
TypeLong::LONG
- }
- return w;
- }
-
Modified: PKGBUILD
===
--- PKGBUILD2015-08-23 18:52:41 UTC (rev 244746)
+++ PKGBUILD2015-08-23 19:11:34 UTC (rev 244747)
@@ -10,9 +10,10 @@
pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src'
'openjdk8-doc')
pkgbase=java8-openjdk
_java_ver=8
-#
http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-_jdk_update=51
-_jdk_build=16
+# Found @
http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
+_jdk_update=60
+# Found @ http://hg.openjdk.java.net/jdk8u/jdk8u
+_jdk_build=24
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
pkgrel=1
@@ -29,20 +30,16 @@
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
-
[arch-commits] Commit in java8-openjdk/trunk (3 files)
Date: Sunday, November 16, 2014 @ 21:35:59
Author: guillaume
Revision: 226334
Use ca-certificates-utils
Modified:
java8-openjdk/trunk/PKGBUILD
java8-openjdk/trunk/install_jdk8-openjdk.sh
java8-openjdk/trunk/install_jre8-openjdk-headless.sh
--+
PKGBUILD |6 +++---
install_jdk8-openjdk.sh |4 ++--
install_jre8-openjdk-headless.sh |4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-11-16 20:35:43 UTC (rev 226333)
+++ PKGBUILD2014-11-16 20:35:59 UTC (rev 226334)
@@ -13,7 +13,7 @@
_jdk_build=18
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://openjdk.java.net/'
license=('custom')
@@ -125,7 +125,7 @@
package_jre8-openjdk-headless() {
pkgdesc='OpenJDK Java 8 headless runtime environment'
- depends=('java-runtime-common' 'ca-certificates-java' 'nss')
+ 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
@@ -174,7 +174,7 @@
done
popd
- # Link JKS keystore from ca-certificates-java
+ # 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
Modified: install_jdk8-openjdk.sh
===
--- install_jdk8-openjdk.sh 2014-11-16 20:35:43 UTC (rev 226333)
+++ install_jdk8-openjdk.sh 2014-11-16 20:35:59 UTC (rev 226334)
@@ -25,7 +25,7 @@
esac
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-/usr/bin/init-jks-keystore
+/usr/bin/update-ca-trust
fi
}
@@ -36,7 +36,7 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-/usr/bin/init-jks-keystore
+/usr/bin/update-ca-trust
fi
}
Modified: install_jre8-openjdk-headless.sh
===
--- install_jre8-openjdk-headless.sh2014-11-16 20:35:43 UTC (rev 226333)
+++ install_jre8-openjdk-headless.sh2014-11-16 20:35:59 UTC (rev 226334)
@@ -25,7 +25,7 @@
esac
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/init-jks-keystore
+ /usr/bin/update-ca-trust
fi
}
@@ -35,7 +35,7 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-/usr/bin/init-jks-keystore
+/usr/bin/update-ca-trust
fi
}
[arch-commits] Commit in java8-openjdk/trunk (3 files)
Date: Monday, September 15, 2014 @ 22:20:50
Author: guillaume
Revision: 221784
Fix INSTALL call to init-jks-keystore
Modified:
java8-openjdk/trunk/PKGBUILD
java8-openjdk/trunk/install_jdk8-openjdk.sh
java8-openjdk/trunk/install_jre8-openjdk-headless.sh
--+
PKGBUILD |2 +-
install_jdk8-openjdk.sh |4 ++--
install_jre8-openjdk-headless.sh |6 --
3 files changed, 7 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-15 20:19:56 UTC (rev 221783)
+++ PKGBUILD2014-09-15 20:20:50 UTC (rev 221784)
@@ -14,7 +14,7 @@
_jdk_build=23
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://openjdk.java.net/'
license=('custom')
Modified: install_jdk8-openjdk.sh
===
--- install_jdk8-openjdk.sh 2014-09-15 20:19:56 UTC (rev 221783)
+++ install_jdk8-openjdk.sh 2014-09-15 20:20:50 UTC (rev 221784)
@@ -13,7 +13,7 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
fi
}
@@ -26,7 +26,7 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
fi
}
Modified: install_jre8-openjdk-headless.sh
===
--- install_jre8-openjdk-headless.sh2014-09-15 20:19:56 UTC (rev 221783)
+++ install_jre8-openjdk-headless.sh2014-09-15 20:20:50 UTC (rev 221784)
@@ -13,7 +13,9 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+# Overwrite JAVA_HOME because if it still points at java-8-openjdk AND
user just removed jdk,
+# Then /usr/bin/java will in the end, refer to
/usr/lib/jvm/java-7-openjdk/java which doesn't exist
+JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
fi
}
@@ -26,7 +28,7 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
fi
}
