From 8763211ebd1e32647b987a38853e3f89cec7f443 Mon Sep 17 00:00:00 2001
From: Alexander Grund <alexander.grund@tu-dresden.de>
Date: Fri, 10 Jan 2020 13:47:52 +0100
Subject: [PATCH] Add patch to fix  build caused by javadoc doclint failure

---
 .../easyconfigs/a/ant/ant-1.10.5-Java-1.8.eb      | 11 ++++++++---
 .../easyconfigs/a/ant/ant-fix-doclint-error.patch | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 easybuild/easyconfigs/a/ant/ant-fix-doclint-error.patch

diff --git a/easybuild/easyconfigs/a/ant/ant-1.10.5-Java-1.8.eb b/easybuild/easyconfigs/a/ant/ant-1.10.5-Java-1.8.eb
index 8ab2e85ab4c9..cdaa36fe44cd 100644
--- a/easybuild/easyconfigs/a/ant/ant-1.10.5-Java-1.8.eb
+++ b/easybuild/easyconfigs/a/ant/ant-1.10.5-Java-1.8.eb
@@ -11,14 +11,19 @@ toolchain = SYSTEM
 
 source_urls = ['https://archive.apache.org/dist/%(name)s/source/']
 sources = ['apache-%(name)s-%(version)s-src.tar.gz']
-checksums = ['5937cf11d74d75d6e8927402950b012e037e362f9f728262ce432ad289b9f6ca']
+patches = ['ant-fix-doclint-error.patch']
+checksums = [
+    '5937cf11d74d75d6e8927402950b012e037e362f9f728262ce432ad289b9f6ca',  # source
+    '28093a4643bdecf690b528a572b1ec7243c000f427c785158eb9d8c957fc222b',  # ant-fix-doclint-error.patch
+]
 
-dependencies = [('Java', '1.8')]
+# specify dependency on Java/1.8 "wrapper", rather than a specific Java version
+dependencies = [('Java', '1.8', '', True)]
 
 builddependencies = [('JUnit', '4.12', versionsuffix)]
 
 sanity_check_paths = {
-    'files': ['bin/ant', 'lib/ant.jar'],
+    'files': ['bin/ant', 'lib/ant.jar', 'lib/ant.jar'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/a/ant/ant-fix-doclint-error.patch b/easybuild/easyconfigs/a/ant/ant-fix-doclint-error.patch
new file mode 100644
index 000000000000..ec151efca10f
--- /dev/null
+++ b/easybuild/easyconfigs/a/ant/ant-fix-doclint-error.patch
@@ -0,0 +1,15 @@
+Author: Alexander Grund
+Ant 10.2 removed the -Xdoclint:none option which leads to build failures
+due to optional packages not beeing found during Javadoc generation
+See https://bz.apache.org/bugzilla/show_bug.cgi?id=63438
+diff -aur a/build.xml b/build.xml
+--- a/build.xml	2018-02-03 17:52:24.000000000 +0100
++++ b/build.xml	2020-01-10 13:34:56.885004000 +0100
+@@ -1456,6 +1456,7 @@
+           description="--> creates the API documentation" unless="javadoc.notrequired">
+     <mkdir dir="${build.javadocs}"/>
+     <javadoc useexternalfile="yes"
++             additionalparam="-Xdoclint:none"
+              destdir="${build.javadocs}"
+              failonerror="true"
+              author="true"