This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository scala.
commit 43ae7f9f65748e1b82d979c39a712f520169b5d7
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Mar 30 16:17:49 2018 +0200
Temporarily build with Java 8 to bootstrap the Java 9 compatible version
---
debian/changelog | 1 +
debian/control | 1 +
debian/rules | 2 ++
3 files changed, 4 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 7c504d3..b89c6e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ scala (2.11.12-1) UNRELEASED; urgency=medium
- 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
+ - Temporarily build with Java 8 to bootstrap the Java 9 compatible version
- Refreshed the patches
- Depend on libjline2-java (>= 2.13)
- Depend on scala-asm (>= 5.2.0-scala-2)
diff --git a/debian/control b/debian/control
index 2dcf63d..e867f0d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders:
Min Huang <min.hu...@alumni.usc.edu>
Build-Depends:
default-jdk,
+ openjdk-8-jdk,
ant,
ant-contrib (>= 1.0~b3+svn177-6),
ant-optional,
diff --git a/debian/rules b/debian/rules
index 2ed24b1..fc760ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
#export DH_VERBOSE=1
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
+
include $(CURDIR)/build.number
BUNDLE_VERSION="$(version.major).$(version.minor).$(version.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
