!54 specify boost-libdir for loongarch64

From: @zhangwenlong01 Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen
specify boost-libdir for loongarch64
2023-05-23 08:15:17 +00:00 · 2023-05-18 16:16:04 +08:00 · 2023-01-03 01:39:09 +00:00 · 2022-12-30 18:00:57 +08:00 · 2022-12-29 06:34:57 +00:00 · 2022-12-29 11:00:34 +08:00
4 changed files with 252 additions and 40 deletions
--- a/backport-THRIFT-5348-Update-debian-copyright.patch
+++ b/backport-THRIFT-5348-Update-debian-copyright.patch
@ -0,0 +1,173 @@
+commit 897652e5f08147efad9db66b86c3036b3d3826db
+Author: Jihoon Seo <jihoon.seo@etri.re.kr>
+Date:   Wed Feb 10 19:08:28 2021 +0900
+
+    THRIFT-5348: Update debian/copyright [skip ci]
+    Patch: Jihoon Seo
+    
+    This closes #2326
+
+diff --git a/debian/copyright b/debian/copyright
+index ada769b08..a7038b1c4 100644
+--- a/debian/copyright
+++ b/debian/copyright
+@@ -17,69 +17,67 @@ conditions of the following licenses.
+ --------------------------------------------------
+ Portions of the following files are licensed under the MIT License:
+ 
+-  lib/erl/src/Makefile.am
+  lib/erl/Makefile.am
+ 
+-Please see doc/otp-base-license.txt for the full terms of this license.
+Please see doc/licenses/otp-base-license.txt for the full terms of this license.
+ 
+ 
+ --------------------------------------------------
+ The following files contain some portions of code contributed under
+-the Thrift Software License (see doc/old-thrift-license.txt), and relicensed
+the Thrift Software License (see doc/licenses/old-thrift-license.txt), and relicensed
+ under the Apache 2.0 License:
+ 
+   compiler/cpp/Makefile.am
+-  compiler/cpp/src/generate/t_cpp_generator.cc
+-  compiler/cpp/src/generate/t_netstd_generator.cc
+-  compiler/cpp/src/generate/t_erl_generator.cc
+-  compiler/cpp/src/generate/t_hs_generator.cc
+-  compiler/cpp/src/generate/t_java_generator.cc
+-  compiler/cpp/src/generate/t_ocaml_generator.cc
+-  compiler/cpp/src/generate/t_perl_generator.cc
+-  compiler/cpp/src/generate/t_php_generator.cc
+-  compiler/cpp/src/generate/t_py_generator.cc
+-  compiler/cpp/src/generate/t_rb_generator.cc
+-  compiler/cpp/src/generate/t_st_generator.cc
+-  compiler/cpp/src/generate/t_xsd_generator.cc
+-  compiler/cpp/src/main.cc
+-  compiler/cpp/src/parse/t_field.h
+-  compiler/cpp/src/parse/t_program.h
+-  compiler/cpp/src/platform.h
+-  compiler/cpp/src/thriftl.ll
+-  compiler/cpp/src/thrifty.yy
+-  lib/netstd/src/Protocol/TBinaryProtocol.cs
+-  lib/netstd/src/Protocol/TField.cs
+-  lib/netstd/src/Protocol/TList.cs
+-  lib/netstd/src/Protocol/TMap.cs
+-  lib/netstd/src/Protocol/TMessage.cs
+-  lib/netstd/src/Protocol/TMessageType.cs
+-  lib/netstd/src/Protocol/TProtocol.cs
+-  lib/netstd/src/Protocol/TProtocolException.cs
+-  lib/netstd/src/Protocol/TProtocolFactory.cs
+-  lib/netstd/src/Protocol/TProtocolUtil.cs
+-  lib/netstd/src/Protocol/TSet.cs
+-  lib/netstd/src/Protocol/TStruct.cs
+-  lib/netstd/src/Protocol/TType.cs
+-  lib/netstd/src/Server/TServer.cs
+-  lib/netstd/src/Server/TSimpleServer.cs
+-  lib/netstd/src/Server/TThreadPoolServer.cs
+-  lib/netstd/src/TApplicationException.cs
+-  lib/netstd/src/Thrift.csproj
+-  lib/netstd/src/Thrift.sln
+-  lib/netstd/src/TProcessor.cs
+-  lib/netstd/src/Transport/TServerSocket.cs
+-  lib/netstd/src/Transport/TServerTransport.cs
+-  lib/netstd/src/Transport/TSocket.cs
+-  lib/netstd/src/Transport/TStreamTransport.cs
+-  lib/netstd/src/Transport/TTransport.cs
+-  lib/netstd/src/Transport/TTransportException.cs
+-  lib/netstd/src/Transport/TTransportFactory.cs
+-  lib/netstd/ThriftMSBuildTask/Properties/AssemblyInfo.cs
+-  lib/netstd/ThriftMSBuildTask/ThriftBuild.cs
+-  lib/netstd/ThriftMSBuildTask/ThriftMSBuildTask.csproj
+  compiler/cpp/src/thrift/generate/t_cpp_generator.cc
+  compiler/cpp/src/thrift/generate/t_netstd_generator.cc
+  compiler/cpp/src/thrift/generate/t_erl_generator.cc
+  compiler/cpp/src/thrift/generate/t_hs_generator.cc
+  compiler/cpp/src/thrift/generate/t_java_generator.cc
+  compiler/cpp/src/thrift/generate/t_ocaml_generator.cc
+  compiler/cpp/src/thrift/generate/t_perl_generator.cc
+  compiler/cpp/src/thrift/generate/t_php_generator.cc
+  compiler/cpp/src/thrift/generate/t_py_generator.cc
+  compiler/cpp/src/thrift/generate/t_rb_generator.cc
+  compiler/cpp/src/thrift/generate/t_st_generator.cc
+  compiler/cpp/src/thrift/generate/t_xsd_generator.cc
+  compiler/cpp/src/thrift/main.cc
+  compiler/cpp/src/thrift/parse/t_field.h
+  compiler/cpp/src/thrift/parse/t_program.h
+  compiler/cpp/src/thrift/platform.h
+  compiler/cpp/src/thrift/thriftl.ll
+  compiler/cpp/src/thrift/thrifty.yy
+  lib/netstd/Thrift/Protocol/TBinaryProtocol.cs
+  lib/netstd/Thrift/Protocol/Entities/TField.cs
+  lib/netstd/Thrift/Protocol/Entities/TList.cs
+  lib/netstd/Thrift/Protocol/Entities/TMap.cs
+  lib/netstd/Thrift/Protocol/Entities/TMessage.cs
+  lib/netstd/Thrift/Protocol/Entities/TMessageType.cs
+  lib/netstd/Thrift/Protocol/TProtocol.cs
+  lib/netstd/Thrift/Protocol/TProtocolException.cs
+  lib/netstd/Thrift/Protocol/TProtocolFactory.cs
+  lib/netstd/Thrift/Protocol/Utilities/TProtocolUtil.cs
+  lib/netstd/Thrift/Protocol/Entities/TSet.cs
+  lib/netstd/Thrift/Protocol/Entities/TStruct.cs
+  lib/netstd/Thrift/Protocol/Entities/TType.cs
+  lib/netstd/Thrift/Server/TServer.cs
+  lib/netstd/Thrift/Server/TSimpleAsyncServer.cs
+  lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs
+  lib/netstd/Thrift/TApplicationException.cs
+  lib/netstd/Thrift/Thrift.csproj
+  lib/netstd/Thrift.sln
+  lib/netstd/Thrift/Transport/Server/TServerSocketTransport.cs
+  lib/netstd/Thrift/Transport/Server/TServerTransport.cs
+  lib/netstd/Thrift/Transport/Client/TSocketTransport.cs
+  lib/netstd/Thrift/Transport/Client/TStreamTransport.cs
+  lib/netstd/Thrift/Transport/TTransport.cs
+  lib/netstd/Thrift/Transport/TTransportException.cs
+  lib/netstd/Thrift/Transport/TTransportFactory.cs
+  lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Properties/AssemblyInfo.cs
+  lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj
+   lib/rb/lib/thrift.rb
+-  lib/st/README
+  lib/st/README.md
+   lib/st/thrift.st
+-  test/OptionalRequiredTest.cpp
+  lib/cpp/test/OptionalRequiredTest.cpp
+   test/OptionalRequiredTest.thrift
+   test/ThriftTest.thrift
+ 
+@@ -91,38 +89,3 @@ For the aclocal/ax_boost_base.m4 and contrib/fb303/aclocal/ax_boost_base.m4 comp
+ #   Copying and distribution of this file, with or without
+ #   modification, are permitted in any medium without royalty provided
+ #   the copyright notice and this notice are preserved.
+-
+---------------------------------------------------
+-For the compiler/cpp/src/md5.[ch] components:
+-
+-/*
+-  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+-
+-  This software is provided 'as-is', without any express or implied
+-  warranty.  In no event will the authors be held liable for any damages
+-  arising from the use of this software.
+-
+-  Permission is granted to anyone to use this software for any purpose,
+-  including commercial applications, and to alter it and redistribute it
+-  freely, subject to the following restrictions:
+-
+-  1. The origin of this software must not be misrepresented; you must not
+-     claim that you wrote the original software. If you use this software
+-     in a product, an acknowledgment in the product documentation would be
+-     appreciated but is not required.
+-  2. Altered source versions must be plainly marked as such, and must not be
+-     misrepresented as being the original software.
+-  3. This notice may not be removed or altered from any source distribution.
+-
+-  L. Peter Deutsch
+-  ghost@aladdin.com
+-
+- */
+-
+----------------------------------------------------
+-For the lib/rb/setup.rb: Copyright (c) 2000-2005 Minero Aoki,
+-lib/ocaml/OCamlMakefile and lib/ocaml/README-OCamlMakefile components:
+-     Copyright (C) 1999 - 2007  Markus Mottl
+-
+-Licensed under the terms of the GNU Lesser General Public License 2.1
+-(see doc/lgpl-2.1.txt for the full terms of this license)
--- a/libthrift-0.14.0-sources.jar
+++ b/libthrift-0.14.0-sources.jar
--- a/libthrift-0.14.0.pom
+++ b/libthrift-0.14.0.pom
@ -11,7 +11,7 @@
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
@ -31,26 +31,26 @@
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.28</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.httpcomponents</groupId>
      <artifactId>httpclient</artifactId>
-      <version>4.5.6</version>
+      <version>4.5.10</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.httpcomponents</groupId>
      <artifactId>httpcore</artifactId>
-      <version>4.4.1</version>
+      <version>4.4.12</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <version>8.5.46</version>
+      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>javax.annotation</groupId>
@ -67,14 +67,31 @@
    <dependency>
      <groupId>org.mockito</groupId>
      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
+      <version>1.10.19</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.28</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+	  <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+
+    </plugins>
+    <sourceDirectory>org/apache/thrift</sourceDirectory>
+  </build>
 </project>
--- a/thrift.spec
+++ b/thrift.spec
@ -4,7 +4,7 @@
 %global have_mongrel 0
 %global have_jsx 0
 %global want_d 0
-%global want_java 0
+%global want_java 1
 %if 0%{?want_java} == 0
 %global java_configure --without-java
 %else
@ -38,20 +38,21 @@
 %global lua_configure --without-lua
 Name:                thrift
 Version:             0.14.0
-Release:             1
+Release:             6
 Summary:             Software framework for cross-language services development
 License:             ASL 2.0 and BSD and zlib
 URL:                 https://thrift.apache.org/
 Source0:             https://archive.apache.org/dist/thrift/%{version}/thrift-%{version}.tar.gz
-Source1:             https://repo1.maven.org/maven2/org/apache/thrift/libthrift/%{version}/libthrift-%{version}.pom
+# wget https://repo1.maven.org/maven2/org/apache/thrift/libthrift/%{version}/libthrift-%{version}.pom
+# add maven-compiler-plugin in build tag
+Source1:             libthrift-%{version}.pom
 Source2:             https://raw.github.com/apache/thrift/%{version}/bootstrap.sh
+Source3:             https://repo1.maven.org/maven2/org/apache/thrift/libthrift/%{version}/libthrift-%{version}-sources.jar
 Patch0:              thrift-char.patch
 Patch2:              configure-java-prefix.patch
-%if 0%{?want_java} > 0
-BuildRequires:       ant >= 1.7
-%endif
+Patch3:              backport-THRIFT-5348-Update-debian-copyright.patch
 BuildRequires:       make autoconf automake bison boost-devel boost-static flex gcc-c++ glib2-devel
-BuildRequires:       libevent-devel libstdc++-devel libtool openssl-devel qt5-qtbase-devel texlive
+BuildRequires:       libevent-devel libstdc++-devel libtool maven openssl-devel qt5-qtbase-devel texlive
 BuildRequires:       zlib-devel
 Obsoletes:           libthrift-java < %{version}-%{release}
 Obsoletes:           libthrift-javadoc < %{version}-%{release}
@ -93,8 +94,8 @@ The thrift-qt package contains GLib bindings for thrift.
 Summary:             Python 3 support for thrift
 BuildRequires:       python3-devel python3-setuptools
 Requires:            thrift%{?_isa} = %{version}-%{release} python3
-Obsoletes:           python-thrift < 0.10.0-1%{?dist}
-Obsoletes:           python2-thrift < 0.10.0-14%{?dist}
+Obsoletes:           python-thrift < 0.10.0-1
+Obsoletes:           python2-thrift < 0.10.0-14
 %description -n python3-thrift
 The python3-thrift package contains Python bindings for thrift.

@ -131,15 +132,6 @@ BuildRequires:       php-devel
 %description -n php-thrift
 The php-thrift package contains PHP bindings for thrift.
 %endif
-%if 0%{?want_java} > 0
-
-%package -n libthrift-javadoc
-Summary:             API documentation for java-thrift
-Requires:            libthrift-java = %{version}-%{release}
-BuildArch:           noarch
-%description -n libthrift-javadoc
-The libthrift-javadoc package contains API documentation for the
-Java bindings for thrift.

 %package -n libthrift-java
 Summary:             Java support for thrift
@ -153,7 +145,7 @@ Requires:            mvn(org.apache.httpcomponents:httpcore)
 BuildArch:           noarch
 %description -n libthrift-java
 The libthrift-java package contains Java bindings for thrift.
-%endif
+
 %if 0%{?want_ruby} > 0

 %package -n ruby-thrift
@ -187,6 +179,14 @@ sed -i 's|ANT_VALID=.*|ANT_VALID=1|' aclocal/ax_javac_and_java.m4
 shopt -s globstar
 sed -i -E 's@^(#!.*/env) *python *$@\1 python3@' **/*.py

+#prepare libthrift's compiler environment
+mkdir libthrift_dir
+cp %{SOURCE1} ./libthrift_dir/pom.xml
+cp %{SOURCE3} ./libthrift_dir
+pushd libthrift_dir
+  jar -xvf libthrift-%{version}-sources.jar
+popd
+
 %build
 export PY_PREFIX=%{_prefix}
 export PERL_PREFIX=%{_prefix}
@ -203,23 +203,25 @@ sed -i 's|-Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java|-Dinstall.javadoc.path
 sed -i 's|$(INSTALL) $$p|$(INSTALL) --mode 644 $$p|g' lib/erl/Makefile.am
 sh ./bootstrap.sh
 export PYTHON=%{_bindir}/python3
+%ifarch loongarch64
+%configure --disable-dependency-tracking --disable-static --with-boost=/usr --with-boost-libdir=/usr/lib64 \
+%else
 %configure --disable-dependency-tracking --disable-static --with-boost=/usr \
+%endif
  --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/thrift-%{version}} \
  %{java_configure} %{ruby_configure} %{erlang_configure} %{golang_configure} %{php_configure} %{lua_configure}
 sed -i -e 's/ -shared / -Wl,--as-needed\0/g' libtool
 %make_build

+pushd libthrift_dir
+  mvn package -DskipTests -Dtar
+popd
+
 %install
 %make_install
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 find %{buildroot} -name fastbinary.so | xargs -r chmod 755
 find %{buildroot} -name \*.erl -or -name \*.hrl -or -name \*.app | xargs -r chmod 644
-%if 0%{?want_java} > 0
-find %{buildroot}/%{_javadir} -name libthrift-javadoc.jar -exec rm -f '{}' \;
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-libthrift.pom
-%add_maven_depmap JPP-libthrift.pom libthrift.jar
-%endif
 find %{buildroot} -name \*.jar -a \! -name \*thrift\* -exec rm -f '{}' \;
 find %{buildroot} -name \*.pod -exec rm -f '{}' \;
 find %{buildroot} -name .packlist -exec rm -f '{}' \;
@ -234,6 +236,12 @@ find %{buildroot} -name Thread.h -exec chmod a-x '{}' \;
 find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r chmod 755
 %ldconfig_scriptlets

+install -d -m 755 %{buildroot}%{_datadir}/java/libthrift
+install -d -m 755 %{buildroot}%{_datadir}/maven-poms/libthrift
+cp libthrift_dir/target/libthrift-%{version}.jar %{buildroot}%{_datadir}/java/libthrift/libthrift.jar
+cp libthrift_dir/pom.xml %{buildroot}%{_datadir}/maven-poms/libthrift/libthrift.pom
+%add_maven_depmap libthrift/libthrift.pom libthrift/libthrift.jar -f "libthrift"
+
 %files
 %doc LICENSE NOTICE
 %{_bindir}/thrift
@ -287,15 +295,29 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r
 %doc LICENSE NOTICE
 %if 0%{?want_java} > 0

-%files -n libthrift-javadoc
-%{_javadocdir}/thrift
-%doc LICENSE NOTICE
-
-%files -n libthrift-java -f .mfiles
+%files -n libthrift-java 
+%{_datadir}/java/libthrift/libthrift.jar
+%{_datadir}/maven-poms/libthrift/libthrift.pom
+%{_datadir}/maven-metadata/thrift-libthrift.xml
 %doc LICENSE NOTICE
 %endif

 %changelog
+* Thu May 18 2023 Wenlong Zhang <zhangwenlong@loongson.cn> - 0.14.0-6
+- specify boost-libdir for loongarch64
+
+* Fri Dec 30 2022 Cao Jingbo <caojb@chinatelecom.cn> - 0.14.0-5
+- Use version macro relpace version number text.
+
+* Wed Dec 28 2022 Cao Jingbo <caojb@chinatelecom.cn> - 0.14.0-4
+- THRIFT-5348: Update debian/copyright [skip ci] Patch: Jihoon Seo
+
+* Mon Jun 13 2022 fushanqing <fushanqing@kylinos.cn> - 0.14.0-3
+- Remove the dist tag
+
+* Wed Jul 28 2021 Ge Wang <wangge20@huawei.com> - 0.14.0-2
+- Add libthrift-java subpackage
+
 * Tue Feb 23 2021 wangyue <wangyue92@huawei.com> - 0.14.0-1
 - Update to 0.14.0 to fix CVE-2020-13949 and Drop fb303 package and switch to qt5
Author	SHA1	Message	Date
openeuler-ci-bot	43fb1a2ab4	!54 specify boost-libdir for loongarch64 From: @zhangwenlong01 Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen	2023-05-23 08:15:17 +00:00
Wenlong Zhang	ac28b33d19	specify boost-libdir for loongarch64	2023-05-18 16:16:04 +08:00
openeuler-ci-bot	096431a24d	!53 使用%{version} 替换spec中数字字段 From: @caojingbo Reviewed-by: @licihua Signed-off-by: @licihua	2023-01-03 01:39:09 +00:00
Cao Jingbo	7a6091e770	Use version macro replace the number	2022-12-30 18:00:57 +08:00
openeuler-ci-bot	67c8cbb76a	!52 修改copyright文件 From: @caojingbo Reviewed-by: @licihua Signed-off-by: @licihua	2022-12-29 06:34:57 +00:00
Cao Jingbo	775835abc6	THRIFT-5348: Update debian/copyright [skip ci] Patch: Jihoon Seo	2022-12-29 11:00:34 +08:00
openeuler-ci-bot	1acb89722b	!48 【轻量级 PR】：Remove the dist tag From: @fu-shanqing Reviewed-by: @overweight Signed-off-by: @overweight	2022-06-13 07:18:00 +00:00
付善庆	571613936d	Remove the dist tag	2022-06-13 03:35:04 +00:00
openeuler-ci-bot	bfe6fdfc01	!20 Add libthrift subpackage From: @wang--ge Reviewed-by: @licihua Signed-off-by: @licihua	2021-07-28 11:57:08 +00:00
wang--ge	36b3a39072	add libthrift subpackage	2021-07-28 15:59:36 +08:00