forked from pool/gettext-runtime
8f82878260
Fix build with jdk9 OBS-URL: https://build.opensuse.org/request/show/530806 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=136
89 lines
4.1 KiB
Diff
89 lines
4.1 KiB
Diff
--- gettext-0.19.8.1/gettext-runtime/configure.ac 2017-10-03 10:21:39.140553367 +0200
|
|
+++ gettext-0.19.8.1/gettext-runtime/configure.ac 2017-10-03 10:21:45.772553392 +0200
|
|
@@ -35,7 +35,7 @@
|
|
|
|
gt_JAVA_CHOICE
|
|
|
|
-gt_JAVACOMP([1.3], [1.1])
|
|
+gt_JAVACOMP([1.6], [1.6])
|
|
AC_CHECK_PROG([JAR], [jar], [jar])
|
|
if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
|
|
BUILDJAVA=yes
|
|
--- gettext-0.19.8.1/gettext-runtime/gnulib-m4/javacomp.m4 2017-10-03 10:21:39.152553367 +0200
|
|
+++ gettext-0.19.8.1/gettext-runtime/gnulib-m4/javacomp.m4 2017-10-03 10:40:49.418502181 +0200
|
|
@@ -118,6 +118,8 @@
|
|
failcode='class conftestfail<T> { T foo() { return null; } }' ;;
|
|
1.5) goodcode='class conftest<T> { T foo() { return null; } }'
|
|
failcode='class conftestfail syntax error' ;;
|
|
+ 1.6) goodcode='class conftest<T> { T foo() { return null; } }'
|
|
+ failcode='class conftestfail syntax error' ;;
|
|
*) AC_MSG_ERROR([invalid source-version argument to gt_@&t@JAVACOMP: $source_version]) ;;
|
|
esac
|
|
case "$target_version" in
|
|
--- gettext-0.19.8.1/gettext-tools/configure.ac 2017-10-03 10:21:39.180553367 +0200
|
|
+++ gettext-0.19.8.1/gettext-tools/configure.ac 2017-10-03 10:46:20.107244296 +0200
|
|
@@ -44,7 +44,7 @@
|
|
AC_SUBST([BUILDJAVAEXE])
|
|
|
|
gt_JAVAEXEC
|
|
-gt_JAVACOMP([1.3])
|
|
+gt_JAVACOMP([1.6], [1.6])
|
|
AC_CHECK_PROG([JAR], [jar], [jar])
|
|
if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
|
|
BUILDJAVA=yes
|
|
--- gettext-0.19.8.1/gettext-tools/examples/hello-java/configure.ac 2017-10-03 10:21:39.260553367 +0200
|
|
+++ gettext-0.19.8.1/gettext-tools/examples/hello-java/configure.ac 2017-10-03 10:50:44.964124163 +0200
|
|
@@ -24,7 +24,7 @@
|
|
dnl Check whether we can execute Java programs.
|
|
gt_JAVAEXEC
|
|
dnl Check whether we can build Java programs.
|
|
-gt_JAVACOMP([1.3])
|
|
+gt_JAVACOMP([1.6], [1.6])
|
|
AC_CHECK_PROG(JAR, jar, jar)
|
|
if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
|
|
BUILDJAVA=yes
|
|
--- gettext-0.19.8.1/gettext-tools/examples/hello-java-awt/configure.ac 2017-10-03 10:21:39.244553367 +0200
|
|
+++ gettext-0.19.8.1/gettext-tools/examples/hello-java-awt/configure.ac 2017-10-03 10:51:15.820124280 +0200
|
|
@@ -24,7 +24,7 @@
|
|
dnl Check whether we can execute Java programs.
|
|
gt_JAVAEXEC([TestAWT], [$srcdir/m4])
|
|
dnl Check whether we can build Java programs.
|
|
-gt_JAVACOMP([1.3])
|
|
+gt_JAVACOMP([1.6], [1.6])
|
|
AC_CHECK_PROG(JAR, jar, jar)
|
|
if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
|
|
BUILDJAVA=yes
|
|
--- gettext-0.19.8.1/gettext-tools/examples/hello-java-qtjambi/configure.ac 2017-10-03 10:21:39.256553367 +0200
|
|
+++ gettext-0.19.8.1/gettext-tools/examples/hello-java-qtjambi/configure.ac 2017-10-03 10:23:16.860553736 +0200
|
|
@@ -26,7 +26,7 @@
|
|
dnl Check whether we can execute Java programs.
|
|
gt_JAVAEXEC([Test15], [$srcdir/m4])
|
|
dnl Check whether we can build Java programs.
|
|
-gt_JAVACOMP([1.5], [1.5])
|
|
+gt_JAVACOMP([1.6], [1.6])
|
|
AC_CHECK_PROG(JAR, jar, jar)
|
|
if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
|
|
BUILDJAVA=yes
|
|
--- gettext-0.19.8.1/gettext-tools/examples/hello-java-swing/configure.ac 2017-10-03 10:21:39.248553367 +0200
|
|
+++ gettext-0.19.8.1/gettext-tools/examples/hello-java-swing/configure.ac 2017-10-03 10:51:00.308124221 +0200
|
|
@@ -24,7 +24,7 @@
|
|
dnl Check whether we can execute Java programs.
|
|
gt_JAVAEXEC([TestAWT], [$srcdir/m4])
|
|
dnl Check whether we can build Java programs.
|
|
-gt_JAVACOMP([1.3])
|
|
+gt_JAVACOMP([1.6], [1.6])
|
|
AC_CHECK_PROG(JAR, jar, jar)
|
|
if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
|
|
BUILDJAVA=yes
|
|
--- gettext-0.19.8.1/gettext-tools/gnulib-m4/javacomp.m4 2017-10-03 10:21:39.268553367 +0200
|
|
+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/javacomp.m4 2017-10-03 10:40:23.914502085 +0200
|
|
@@ -118,6 +118,8 @@
|
|
failcode='class conftestfail<T> { T foo() { return null; } }' ;;
|
|
1.5) goodcode='class conftest<T> { T foo() { return null; } }'
|
|
failcode='class conftestfail syntax error' ;;
|
|
+ 1.6) goodcode='class conftest<T> { T foo() { return null; } }'
|
|
+ failcode='class conftestfail syntax error' ;;
|
|
*) AC_MSG_ERROR([invalid source-version argument to gt_@&t@JAVACOMP: $source_version]) ;;
|
|
esac
|
|
case "$target_version" in
|