Dirk Mueller
5087dd2b49
- update to v21.12: * Python * Fix broken enum ranges (#11171) * Stop requiring extension fields to have a sythetic oneof (#11091) * Python runtime 4.21.10 not works generated code can not load valid proto. OBS-URL: https://build.opensuse.org/request/show/1043179 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=139
86 lines
3.6 KiB
Diff
86 lines
3.6 KiB
Diff
From 15daef3b7912b9434955a8614e018de00591aefb Mon Sep 17 00:00:00 2001
|
|
From: Deanna Garcia <deannagarcia@google.com>
|
|
Date: Wed, 3 Aug 2022 17:40:03 +0000
|
|
Subject: [PATCH 1/2] Use release version instead of libtool version
|
|
|
|
---
|
|
src/Makefile.am | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: protobuf-21.12/src/Makefile.am
|
|
===================================================================
|
|
--- protobuf-21.12.orig/src/Makefile.am
|
|
+++ protobuf-21.12/src/Makefile.am
|
|
@@ -18,7 +18,7 @@ else
|
|
PTHREAD_DEF =
|
|
endif
|
|
|
|
-PROTOBUF_VERSION = 32:12:0
|
|
+PROTOBUF_VERSION = 3.21.12
|
|
|
|
if GCC
|
|
# Turn on all warnings except for sign comparison (we ignore sign comparison
|
|
@@ -188,7 +188,7 @@ nobase_include_HEADERS =
|
|
lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
|
|
|
|
libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
|
|
-libprotobuf_lite_la_LDFLAGS = -version-info $(PROTOBUF_VERSION) -export-dynamic -no-undefined
|
|
+libprotobuf_lite_la_LDFLAGS = -release $(PROTOBUF_VERSION) -export-dynamic -no-undefined
|
|
if HAVE_LD_VERSION_SCRIPT
|
|
libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map
|
|
EXTRA_libprotobuf_lite_la_DEPENDENCIES = libprotobuf-lite.map
|
|
@@ -235,7 +235,7 @@ libprotobuf_lite_la_SOURCES =
|
|
google/protobuf/wire_format_lite.cc
|
|
|
|
libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
|
|
-libprotobuf_la_LDFLAGS = -version-info $(PROTOBUF_VERSION) -export-dynamic -no-undefined
|
|
+libprotobuf_la_LDFLAGS = -release $(PROTOBUF_VERSION) -export-dynamic -no-undefined
|
|
if HAVE_LD_VERSION_SCRIPT
|
|
libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map
|
|
EXTRA_libprotobuf_la_DEPENDENCIES = libprotobuf.map
|
|
@@ -320,7 +320,7 @@ libprotobuf_la_SOURCES =
|
|
nodist_libprotobuf_la_SOURCES = $(nodist_libprotobuf_lite_la_SOURCES)
|
|
|
|
libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
|
|
-libprotoc_la_LDFLAGS = -version-info $(PROTOBUF_VERSION) -export-dynamic -no-undefined
|
|
+libprotoc_la_LDFLAGS = -release $(PROTOBUF_VERSION) -export-dynamic -no-undefined
|
|
if HAVE_LD_VERSION_SCRIPT
|
|
libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map
|
|
EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map
|
|
Index: protobuf-21.12/cmake/libprotobuf-lite.cmake
|
|
===================================================================
|
|
--- protobuf-21.12.orig/cmake/libprotobuf-lite.cmake
|
|
+++ protobuf-21.12/cmake/libprotobuf-lite.cmake
|
|
@@ -112,7 +112,6 @@ if(protobuf_BUILD_SHARED_LIBS)
|
|
endif()
|
|
set_target_properties(libprotobuf-lite PROPERTIES
|
|
VERSION ${protobuf_VERSION}
|
|
- SOVERSION 32
|
|
OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
|
|
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
|
|
add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
|
|
Index: protobuf-21.12/cmake/libprotobuf.cmake
|
|
===================================================================
|
|
--- protobuf-21.12.orig/cmake/libprotobuf.cmake
|
|
+++ protobuf-21.12/cmake/libprotobuf.cmake
|
|
@@ -128,7 +128,6 @@ if(protobuf_BUILD_SHARED_LIBS)
|
|
endif()
|
|
set_target_properties(libprotobuf PROPERTIES
|
|
VERSION ${protobuf_VERSION}
|
|
- SOVERSION 32
|
|
OUTPUT_NAME ${LIB_PREFIX}protobuf
|
|
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
|
|
add_library(protobuf::libprotobuf ALIAS libprotobuf)
|
|
Index: protobuf-21.12/cmake/libprotoc.cmake
|
|
===================================================================
|
|
--- protobuf-21.12.orig/cmake/libprotoc.cmake
|
|
+++ protobuf-21.12/cmake/libprotoc.cmake
|
|
@@ -130,7 +130,6 @@ endif()
|
|
set_target_properties(libprotoc PROPERTIES
|
|
COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
|
|
VERSION ${protobuf_VERSION}
|
|
- SOVERSION 32
|
|
OUTPUT_NAME ${LIB_PREFIX}protoc
|
|
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
|
|
add_library(protobuf::libprotoc ALIAS libprotoc)
|