drop -source 1.4 -- frysk-0.4-javac.patch

This commit is contained in:
Andrew Cagney 2020-06-09 17:46:12 -04:00
commit 0e977d99b1
2 changed files with 37 additions and 1 deletions

31
frysk-0.4-javac.patch Normal file
View file

@ -0,0 +1,31 @@
diff --git a/frysk-common/frysk-common.ac b/frysk-common/frysk-common.ac
index 8d7f83780..c9a2be863 100644
--- a/frysk-common/frysk-common.ac
+++ b/frysk-common/frysk-common.ac
@@ -151,10 +151,10 @@ AC_DEFUN([AC_LANG_COMPILER(Java)], [])
AU_DEFUN([AC_LANG_JAVAC], [AC_LANG(Java)])
AC_LANG(Java)
-JAVAC='javac -source 1.4'
-AS_IF([test x"$enable_werror" = xyes],
- [WERROR_JAVACFLAGS='-Werror -Xlint:all -Xlint:-options -Xlint:-cast'],
- [WERROR_JAVACFLAGS=])
+JAVAC='javac'
+# AS_IF([test x"$enable_werror" = xyes],
+# [WERROR_JAVACFLAGS='-Werror -Xlint:all -Xlint:-options -Xlint:-cast'],
+# [WERROR_JAVACFLAGS=])
AC_SUBST([JAVAC])
AC_SUBST([JAVACFLAGS])
AC_SUBST([WERROR_JAVACFLAGS])
diff --git a/frysk-common/javadocs.sh b/frysk-common/javadocs.sh
index fa9b33fd4..01f4f3e1d 100644
--- a/frysk-common/javadocs.sh
+++ b/frysk-common/javadocs.sh
@@ -93,7 +93,6 @@ for scope in public private ; do
-link ${jg}/libgconf-java-2.12.5/api/ \
-link ${jg}/libvte-java-0.12.2/api/ \
-overview ${overview} \
- -source 1.4 \
-d javadoc/$scope \
-use \
-linksource \

View file

@ -1,7 +1,7 @@
Summary: Execution analysis and debugging tool-suite
Name: frysk
Version: 0.4
Release: 70%{?dist}
Release: 71%{?dist}
# Fedora 17+ is still waiting for vte et.al. bindings.
%define enable_gnome %{fedora}0 < 170
@ -64,6 +64,7 @@ Patch42: frysk-0.4-jline1-to-jline.patch
Patch43: frysk-0.4-disable-arch32-tests.patch
Patch44: frysk-0.4-steptester-indentation.patch
Patch45: frysk-0.4-gcc-fcommon.patch
Patch46: frysk-0.4-javac.patch
Patch100: frysk-0.4-aclocaljavac.patch
Patch101: frysk-0.4-cxx-scope.patch
@ -263,6 +264,7 @@ mv frysk-imports/libunwind/configure.{in,ac}
%patch43 -p1 -z .disable-arch32-tests
%patch44 -p1 -z .steptester-indentation
%patch45 -p1 -z .gcc-fcommon
%patch46 -p1 -z .javac
echo "%{version}-%{release}" > frysk-common/version.in
@ -445,6 +447,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug
%endif
%changelog
* Tue Jun 9 2020 Andrew Cagney <cagney@fedoraproject.org> - 0.4-71
- drop -source 1.4 -- frysk-0.4-javac.patch
* Tue Jan 28 2020 Andrew Cagney <cagney@fedoraproject.org> - 0.4-70
- pacify gcc -fcommon