From aa8872c1aeec03ba9fc14842a66c0e3616417f00 Mon Sep 17 00:00:00 2001 From: baizg1107 Date: Wed, 8 Dec 2021 17:02:45 +0800 Subject: [PATCH] fix java compile fail (cherry picked from commit 89ec73e68aa18bafa75aa2f734a7f863c864c1b7) --- fix-java-compile-fail.patch | 24 ++++++++++++++++++++++++ thrift.spec | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 fix-java-compile-fail.patch diff --git a/fix-java-compile-fail.patch b/fix-java-compile-fail.patch new file mode 100644 index 0000000..03501f8 --- /dev/null +++ b/fix-java-compile-fail.patch @@ -0,0 +1,24 @@ +From d4ee11f2e829d605609b91d75301d1c5c1b75c07 Mon Sep 17 00:00:00 2001 +From: root +Date: Wed, 8 Dec 2021 16:22:42 +0800 +Subject: [PATCH] fix java compile fail + +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 034b4cf..9d239c7 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -111,6 +111,7 @@ AC_ARG_ENABLE([libs], + [], enable_libs=yes + ) + have_libs=yes ++with_java="no" + if test "$enable_libs" = "no"; then + have_libs="no" + with_as3="no" +-- +2.27.0 + diff --git a/thrift.spec b/thrift.spec index 2930794..9e8ff0e 100644 --- a/thrift.spec +++ b/thrift.spec @@ -38,7 +38,7 @@ %global lua_configure --without-lua Name: thrift Version: 0.14.0 -Release: 2 +Release: 3 Summary: Software framework for cross-language services development License: ASL 2.0 and BSD and zlib and MIT URL: https://thrift.apache.org/ @@ -50,6 +50,7 @@ Source2: https://raw.github.com/apache/thrift/%{version}/bootstrap.s Source3: https://repo1.maven.org/maven2/org/apache/thrift/libthrift/%{version}/libthrift-%{version}-sources.jar Patch0: thrift-char.patch Patch2: configure-java-prefix.patch +Patch3: fix-java-compile-fail.patch BuildRequires: make autoconf automake bison boost-devel boost-static flex gcc-c++ glib2-devel BuildRequires: libevent-devel libstdc++-devel libtool maven openssl-devel qt5-qtbase-devel texlive BuildRequires: zlib-devel @@ -298,6 +299,9 @@ cp libthrift_dir/pom.xml %{buildroot}%{_datadir}/maven-poms/libthrift/libthrift. %endif %changelog +* Wed Dec 8 2021 baizhonggui - 0.14.0-3 +- fix java compile fail + * Wed Jul 28 2021 Ge Wang - 0.14.0-2 - Add libthrift-java subpackage -- Gitee