rpms/java-1.8.0-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable doclint by default

Browse Source
This commit is contained in:
Omair Majid 2014-03-21 16:03:29 -04:00
parent 4616e9cf28
commit 88a34023d2
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
disable-doclint-by-default.patch Normal file
View File

@ -0,0 +1,27 @@
Disable doclint by default
OpenJDK 8 adds and enables doclint by default. This catches issues in
javadoc comments. It is too strict, breaks javadoc compilation and, in
general, breaks the build for old code known to build with previous
versions of OpenJDK.
See: http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
See: https://lists.fedoraproject.org/pipermail/java-devel/2014-February/005150.html
diff -r 9d81ae1c417a jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
--- jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java Thu Feb 06 17:35:47 2014 -0800
+++ jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java Mon Feb 24 19:44:12 2014 +0000
@@ -811,10 +811,9 @@
doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt);
}
- if (doclintOpts.isEmpty()) {
- doclintOpts.add(DocLint.XMSGS_OPTION);
- } else if (doclintOpts.size() == 1
- && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) {
+ if (doclintOpts.isEmpty() ||
+ (doclintOpts.size() == 1
+ && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none"))) {
return;
}

9
java-1.8.0-openjdk.spec
View File

@ -130,7 +130,7 @@
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever} Version: %{javaver}.%{updatever}
Release: 0.34.%{buildver}%{?dist} Release: 0.35.%{buildver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -192,6 +192,8 @@ Patch3: java-atk-wrapper-security.patch
Patch4: PStack-808293.patch Patch4: PStack-808293.patch
# Allow multiple initialization of PKCS11 libraries # Allow multiple initialization of PKCS11 libraries
Patch5: multiple-pkcs11-library-init.patch Patch5: multiple-pkcs11-library-init.patch
# Disable doclint for compatibility
Patch6: disable-doclint-by-default.patch
# #
# OpenJDK specific patches # OpenJDK specific patches
@ -420,6 +422,7 @@ sh %{SOURCE12}
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5
%patch6
%patch99 %patch99
@ -1088,6 +1091,10 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties %{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog %changelog
* Fri Mar 21 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.35.b132
- Disable doclint for compatiblity
- Patch contributed by Andrew John Hughes
* Tue Mar 11 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.34.b132 * Tue Mar 11 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.34.b132
- Include jdeps and jjs for aarch64. These are present in b128. - Include jdeps and jjs for aarch64. These are present in b128.