From 801439ec4912e1af065b2575a51e764e6797dcaf Mon Sep 17 00:00:00 2001 From: cherry530 Date: Fri, 17 Dec 2021 15:02:59 +0800 Subject: [PATCH] Fix compile error Signed-off-by: cherry530 --- 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 b2181a4..c3e2347 100644 --- a/thrift.spec +++ b/thrift.spec @@ -38,7 +38,7 @@ %global lua_configure --without-lua Name: thrift Version: 0.14.0 -Release: 3 +Release: 4 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 +* Fri Dec 17 2021 caodongxia - 0.14.0-4 +- fix java compile fail + * Thu Dec 16 2021 wangkai - 0.14.0-3 - This package depends on log4j.After the log4j vulnerability CVE-2021-44228 is fixed,the version needs to be rebuild. -- Gitee