This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository scala.
commit b8bc166595f0db4a6dd00128860892a5e30067f2
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Mar 30 14:24:44 2018 +0200
Disabled the boot classpath by default (-nobootcp) to run with Java 9
---
debian/changelog | 1 +
debian/patches/0016-nobootcp-by-default.patch | 14 ++++++++++++++
debian/patches/series | 1 +
3 files changed, 16 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ec7c498..9a42c7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ scala (2.11.12-1) UNRELEASED; urgency=medium
* New upstream release
- Fixes the Java 9 compatibility at runtime (Closes: #873705)
- Patched the project to build with Java 9
+ - Disabled the boot classpath by default (-nobootcp) to run with Java 9
- Refreshed the patches
- Depend on libjline2-java (>= 2.13)
- Depend on scala-asm (>= 5.2.0-scala-2)
diff --git a/debian/patches/0016-nobootcp-by-default.patch
b/debian/patches/0016-nobootcp-by-default.patch
new file mode 100644
index 0000000..f2b3bb4
--- /dev/null
+++ b/debian/patches/0016-nobootcp-by-default.patch
@@ -0,0 +1,14 @@
+Description: Disables the boot classpath by default (-nobootcp) to run with
Java 9
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: no
+--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
++++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+@@ -137,6 +137,8 @@
+ # but I don't want to flip the default during 2.11's RC cycle
+ OVERRIDE_USEJAVACP="-Dscala.usejavacp=true"
+
++usebootcp="false"
++
+ while [[ $# -gt 0 ]]; do
+ case "$1" in
+ -D*)
diff --git a/debian/patches/series b/debian/patches/series
index d46772c..3ff72f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
0013-disable-jarlister.patch
0014-disable-jdk-check.patch
0015-java9-compatibility.patch
+0016-nobootcp-by-default.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/scala.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
