开源软件构建与测试

Changes of Revision 5

_service:tar_scm:protobuf.spec Changed

@@ -7,7 +7,7 @@
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        25.1
-Release:        1
+Release:        2
 License:        BSD
 URL:            https://github.com/protocolbuffers/protobuf
 Source:         https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz
@@ -15,6 +15,7 @@
 %global so_version 25.1
 
 Patch9000:      0001-add-secure-compile-option.patch
+Patch9001:      0001-Fix-CC-compiler-support.patch
 
 BuildRequires:  cmake gcc-c++ emacs zlib-devel gmock-devel gtest-devel jsoncpp-devel
 BuildRequires:  fdupes pkgconfig python-rpm-macros pkgconfig(zlib) ninja-build
@@ -232,6 +233,8 @@
 	-DCMAKE_MODULE_LINKER_FLAGS=-Wl,--as-needed \
 	-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--as-needed \
 	-DCMAKE_CXX_FLAGS="-g -O2" \
+        -DCMAKE_C_COMPILER=%{__cc} \
+        -DCMAKE_CXX_COMPILER=%{__cxx} \
 	-G Ninja \
 	../
 popd
@@ -247,6 +250,8 @@
 	-Dprotobuf_ABSL_PROVIDER=package \
 	-Dprotobuf_BUILD_TESTS:BOOL=OFF \
 	-DCMAKE_CXX_FLAGS="-fPIC" \
+        -DCMAKE_C_COMPILER=%{__cc} \
+        -DCMAKE_CXX_COMPILER=%{__cxx} \
 	-G Ninja \
 	../
 popd
@@ -387,6 +392,9 @@
 %endif
 
 %changelog
+* Wed Mar 20 2024 wangqiang <wangqiang1@kylinos.cn> - 25.1-2
+- Support package build with clang
+
 * Wed Jan 10 2024 zhongtao <zhongtao17@huawei.com> - 25.1-1
 - Type:upgrade
 - ID:NA

_service:tar_scm:0001-Fix-CC-compiler-support.patch Added