Projects
openEuler:24.03
protobuf
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 8
View file
_service:tar_scm:protobuf.spec
Changed
@@ -7,7 +7,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 25.1 -Release: 2 +Release: 3 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,7 +15,7 @@ %global so_version 25.1 Patch9000: 0001-add-secure-compile-option.patch -Patch9001: 0001-Fix-CC-compiler-support.patch +Patch9001: 0002-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 @@ -233,8 +233,9 @@ -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} \ + -DCMAKE_C_COMPILER=%{__cc} \ + -DCMAKE_CXX_COMPILER=%{__cxx} \ + -DCMAKE_SKIP_RPATH=TRUE \ -G Ninja \ ../ popd @@ -250,8 +251,9 @@ -Dprotobuf_ABSL_PROVIDER=package \ -Dprotobuf_BUILD_TESTS:BOOL=OFF \ -DCMAKE_CXX_FLAGS="-fPIC" \ - -DCMAKE_C_COMPILER=%{__cc} \ - -DCMAKE_CXX_COMPILER=%{__cxx} \ + -DCMAKE_C_COMPILER=%{__cc} \ + -DCMAKE_CXX_COMPILER=%{__cxx} \ + -DCMAKE_SKIP_RPATH=TRUE \ -G Ninja \ ../ popd @@ -260,6 +262,9 @@ %ninja_build -C build %ninja_build -C build-static +# we have to override LD_LIBRARY_PATH because we eliminated rpath +export LD_LIBRARY_PATH="${PWD}/build":$LD_LIBRARY_PATH + %if %{with python} # Use the just built protoc instead of any # system version for python and/or java bindings @@ -392,6 +397,12 @@ %endif %changelog +* Tue Apr 09 2024 zhongtao <zhongtao17@huawei.com> - 25.1-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: add secure complie option and code improve + * Wed Mar 20 2024 wangqiang <wangqiang1@kylinos.cn> - 25.1-2 - Support package build with clang
View file
_service:tar_scm:0001-Fix-CC-compiler-support.patch
Deleted
@@ -1,29 +0,0 @@ -From b62fbe3852ea070f1bfbb048e71dfae70c7c71f0 Mon Sep 17 00:00:00 2001 -From: wangqiang <wangqiang1@kylinos.cn> -Date: Tue, 19 Mar 2024 18:54:13 +0800 -Subject: PATCH Fix CC compiler support - ---- - third_party/utf8_range/utf8_to_utf16/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/third_party/utf8_range/utf8_to_utf16/Makefile b/third_party/utf8_range/utf8_to_utf16/Makefile -index 853ffa4..30ef021 100644 ---- a/third_party/utf8_range/utf8_to_utf16/Makefile -+++ b/third_party/utf8_range/utf8_to_utf16/Makefile -@@ -1,10 +1,10 @@ --CC = gcc -+CC := ${CC} - CPPFLAGS = -g -O3 -Wall -march=native - - OBJS = main.o iconv.o naive.o - - utf8to16: ${OBJS} -- gcc $^ -o $@ -+ ${CC} $^ -o $@ - - .PHONY: clean - clean: --- -2.33.0 -
View file
_service:tar_scm:0001-add-secure-compile-option.patch
Changed
@@ -1,26 +1,27 @@ -From bc32151458494ce41b4ccc0e0e87999ce27a15fc Mon Sep 17 00:00:00 2001 +From 4cf6dc9f628fc2c5b3478d70e15d4fab8a32ae86 Mon Sep 17 00:00:00 2001 From: zhongtao <zhongtao17@huawei.com> -Date: Wed, 10 Jan 2024 16:21:07 +0800 +Date: Wed, 10 Apr 2024 11:43:51 +0800 Subject: PATCH add secure compile option Signed-off-by: zhongtao <zhongtao17@huawei.com> --- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4137ce2..05ee303 100644 +index 4137ce2..d17f09d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2,6 +2,8 @@ +@@ -2,6 +2,9 @@ # to 3.26. cmake_minimum_required(VERSION 3.10...3.26) -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,now -fstack-check") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,now -fstack-check -fPIE") ++set(CMAKE_EXE_LINKER_FLAGS "-pie") + # Revert to old behavior for MSVC debug symbols. if(POLICY CMP0141) cmake_policy(SET CMP0141 OLD) -- -2.43.0 +2.25.1
View file
_service:tar_scm:0002-Fix-CC-compiler-support.patch
Added
@@ -0,0 +1,29 @@ +From b62fbe3852ea070f1bfbb048e71dfae70c7c71f0 Mon Sep 17 00:00:00 2001 +From: wangqiang <wangqiang1@kylinos.cn> +Date: Tue, 19 Mar 2024 18:54:13 +0800 +Subject: PATCH Fix CC compiler support + +--- + third_party/utf8_range/utf8_to_utf16/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/third_party/utf8_range/utf8_to_utf16/Makefile b/third_party/utf8_range/utf8_to_utf16/Makefile +index 853ffa4..30ef021 100644 +--- a/third_party/utf8_range/utf8_to_utf16/Makefile ++++ b/third_party/utf8_range/utf8_to_utf16/Makefile +@@ -1,10 +1,10 @@ +-CC = gcc ++CC := ${CC} + CPPFLAGS = -g -O3 -Wall -march=native + + OBJS = main.o iconv.o naive.o + + utf8to16: ${OBJS} +- gcc $^ -o $@ ++ ${CC} $^ -o $@ + + .PHONY: clean + clean: +-- +2.33.0 +
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2