From 97a6cbda3ef0e318c4e26c12bd48798b8b08ad3b Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 26 Mar 2016 17:28:58 +0000
Subject: [PATCH] Debian: Set bootclasspath in override.properties Require
 openjdk-7-jdk to build hso we have the correct bootclasspath jars

---
 debian/control | 2 +-
 debian/rules   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 978745492f..e56a71ac95 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7.0.50~)
  ,ant (>= 1.8)
  ,ant-optional
  ,debconf
- ,default-jdk | openjdk-7-jdk
+ ,openjdk-7-jdk
  ,dh-apparmor
  ,gettext
  ,libgmp-dev (>= 2:5.0.5)
diff --git a/debian/rules b/debian/rules
index 760bd5709e..80cd2b5769 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ override_dh_auto_clean:
 	rm -rf $(CURDIR)/core/c/jcpuid/lib/
 	rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
 	rm -rf $(CURDIR)/debian/python-i2p
+	rm -f $(CURDIR)/override.properties
 	debconf-updatepo
 
 override_dh_auto_build:
@@ -71,6 +72,11 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
 else
 	@echo "Already found deb in version, not doing anything"
 endif
+	# build options
+	@/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
+	@/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
+	@/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
+	@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
 	TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
 	echo router.updateDisabled=true > $(I2P)/router.config
 	mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
-- 
GitLab