Skip to content

Commit

Permalink
Add patch to fix build caused by javadoc doclint failure
Browse files Browse the repository at this point in the history
  • Loading branch information
Flamefire committed Jan 13, 2020
1 parent b720729 commit 8763211
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
11 changes: 8 additions & 3 deletions easybuild/easyconfigs/a/ant/ant-1.10.5-Java-1.8.eb
Expand Up @@ -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': [],
}

Expand Down
15 changes: 15 additions & 0 deletions 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"

0 comments on commit 8763211

Please sign in to comment.