| 1 |
commit: e8d1cbb9ab718517c1d541663bf004522395e6f1 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sun Mar 13 10:03:37 2022 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 27 22:07:09 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d1cbb9 |
| 7 |
|
| 8 |
dev-libs/protobuf: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/24529 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../protobuf-3.18.0-disable_no-warning-test.patch | 36 ----- |
| 16 |
.../files/protobuf-3.18.0-system_libraries.patch | 146 --------------------- |
| 17 |
2 files changed, 182 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 9abf5deca295..000000000000 |
| 22 |
--- a/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,36 +0,0 @@ |
| 25 |
-From 290073d7d4ddaa6d39ad12c90245e795c5482432 Mon Sep 17 00:00:00 2001 |
| 26 |
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org> |
| 27 |
-Date: Sat, 29 Jan 2022 22:43:50 +0800 |
| 28 |
-Subject: [PATCH] protobuf-3.18.0: disable no-warning test |
| 29 |
- |
| 30 |
-Disable no-warning-test which is compiled with -Werror option |
| 31 |
-and whose only purpose is checking if compilation results in any warnings. |
| 32 |
- |
| 33 |
-Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org> |
| 34 |
-Signed-off-by: Yixun Lan <dlan@g.o> |
| 35 |
---- |
| 36 |
- src/Makefile.am | 4 ++-- |
| 37 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 38 |
- |
| 39 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
| 40 |
-index e6b4d0f..1cfd885 100644 |
| 41 |
---- a/src/Makefile.am |
| 42 |
-+++ b/src/Makefile.am |
| 43 |
-@@ -726,7 +726,7 @@ GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest |
| 44 |
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock |
| 45 |
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ |
| 46 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
| 47 |
-- no-warning-test $(GZCHECKPROGRAMS) |
| 48 |
-+ $(GZCHECKPROGRAMS) |
| 49 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
| 50 |
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
| 51 |
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
| 52 |
-@@ -915,4 +915,4 @@ nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) |
| 53 |
- |
| 54 |
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ |
| 55 |
- google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ |
| 56 |
-- protobuf-lite-arena-test no-warning-test |
| 57 |
-+ protobuf-lite-arena-test |
| 58 |
--- |
| 59 |
-2.34.1 |
| 60 |
- |
| 61 |
|
| 62 |
diff --git a/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch |
| 63 |
deleted file mode 100644 |
| 64 |
index 0e417c51bdab..000000000000 |
| 65 |
--- a/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch |
| 66 |
+++ /dev/null |
| 67 |
@@ -1,146 +0,0 @@ |
| 68 |
-From 10b2d5bb5a4d1b7529cb781e5513940ad6db4ada Mon Sep 17 00:00:00 2001 |
| 69 |
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org> |
| 70 |
-Date: Sat, 29 Jan 2022 22:46:38 +0800 |
| 71 |
-Subject: [PATCH] protobuf-3.18.0: system_libraries |
| 72 |
- |
| 73 |
-Use system version of GoogleTest, |
| 74 |
-which will unbundle gtest, gmock libraries |
| 75 |
- |
| 76 |
-Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org> |
| 77 |
-Signed-off-by: Yixun Lan <dlan@g.o> |
| 78 |
---- |
| 79 |
- Makefile.am | 20 +------------------- |
| 80 |
- configure.ac | 7 ------- |
| 81 |
- src/Makefile.am | 33 ++++++--------------------------- |
| 82 |
- 3 files changed, 7 insertions(+), 53 deletions(-) |
| 83 |
- |
| 84 |
-diff --git a/Makefile.am b/Makefile.am |
| 85 |
-index 7ce954e..c1493e0 100644 |
| 86 |
---- a/Makefile.am |
| 87 |
-+++ b/Makefile.am |
| 88 |
-@@ -11,28 +11,10 @@ SUBDIRS = . src |
| 89 |
- # Always include third_party directories in distributions. |
| 90 |
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest |
| 91 |
- |
| 92 |
--# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS |
| 93 |
--# because then "make check" would also build and run all of gmock's own tests, |
| 94 |
--# which takes a lot of time and is generally not useful to us. Also, we don't |
| 95 |
--# want "make install" to recurse into gmock since we don't want to overwrite |
| 96 |
--# the installed version of gmock if there is one. |
| 97 |
- check-local: |
| 98 |
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
| 99 |
-- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
| 100 |
-- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
| 101 |
- |
| 102 |
--# We would like to clean gmock when "make clean" is invoked. But we have to |
| 103 |
--# be careful because clean-local is also invoked during "make distclean", but |
| 104 |
--# "make distclean" already recurses into gmock because it's listed among the |
| 105 |
--# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to |
| 106 |
--# cd to the directory again and "make clean" it will fail. So, check that the |
| 107 |
--# Makefile exists before recursing. |
| 108 |
- clean-local: |
| 109 |
-- @if test -e third_party/googletest/Makefile; then \ |
| 110 |
-- echo "Making clean in googletest"; \ |
| 111 |
-- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
| 112 |
-- fi; \ |
| 113 |
-- if test -e conformance/Makefile; then \ |
| 114 |
-+ @if test -e conformance/Makefile; then \ |
| 115 |
- echo "Making clean in conformance"; \ |
| 116 |
- cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
| 117 |
- fi; \ |
| 118 |
-diff --git a/configure.ac b/configure.ac |
| 119 |
-index 4a6d50a..6301bd6 100644 |
| 120 |
---- a/configure.ac |
| 121 |
-+++ b/configure.ac |
| 122 |
-@@ -236,12 +236,5 @@ if test "x$ANDROID_TEST" = xyes; then |
| 123 |
- fi |
| 124 |
- AC_SUBST([LIBLOG_LIBS]) |
| 125 |
- |
| 126 |
--# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, |
| 127 |
--# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock |
| 128 |
--# too. |
| 129 |
--export CFLAGS |
| 130 |
--export CXXFLAGS |
| 131 |
--AC_CONFIG_SUBDIRS([third_party/googletest]) |
| 132 |
-- |
| 133 |
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) |
| 134 |
- AC_OUTPUT |
| 135 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
| 136 |
-index 1cfd885..73c2c6d 100644 |
| 137 |
---- a/src/Makefile.am |
| 138 |
-+++ b/src/Makefile.am |
| 139 |
-@@ -720,19 +720,11 @@ COMMON_TEST_SOURCES = \ |
| 140 |
- google/protobuf/testing/googletest.cc \ |
| 141 |
- google/protobuf/testing/googletest.h |
| 142 |
- |
| 143 |
--GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest |
| 144 |
--GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock |
| 145 |
--GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest |
| 146 |
--GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock |
| 147 |
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ |
| 148 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
| 149 |
- $(GZCHECKPROGRAMS) |
| 150 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
| 151 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
| 152 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
| 153 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
| 154 |
--protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \ |
| 155 |
-- -I$(GOOGLEMOCK_SRC_DIR)/include |
| 156 |
-+ -lgtest -lgmock -lgmock_main |
| 157 |
- # Disable optimization for tests unless the user explicitly asked for it, |
| 158 |
- # since test_util.cc takes forever to compile with optimization (with GCC). |
| 159 |
- # See configure.ac for more info. |
| 160 |
-@@ -825,12 +817,8 @@ $(am_protobuf_test_OBJECTS): unittest_proto_middleman |
| 161 |
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. |
| 162 |
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ |
| 163 |
- libprotoc.la \ |
| 164 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
| 165 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
| 166 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
| 167 |
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ |
| 168 |
-- -I$(GOOGLETEST_SRC_DIR)/include \ |
| 169 |
-- -DPROTOBUF_TEST_NO_DESCRIPTORS |
| 170 |
-+ -lgtest -lgmock -lgmock_main |
| 171 |
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS |
| 172 |
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
| 173 |
- protobuf_lazy_descriptor_test_SOURCES = \ |
| 174 |
- google/protobuf/compiler/cpp/cpp_unittest.cc \ |
| 175 |
-@@ -851,11 +839,7 @@ COMMON_LITE_TEST_SOURCES = \ |
| 176 |
- # full runtime and we want to make sure this test builds without full |
| 177 |
- # runtime. |
| 178 |
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
| 179 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
| 180 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
| 181 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
| 182 |
--protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \ |
| 183 |
-- -I$(GOOGLETEST_SRC_DIR)/include |
| 184 |
-+ -lgtest -lgmock -lgmock_main |
| 185 |
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
| 186 |
- protobuf_lite_test_SOURCES = \ |
| 187 |
- google/protobuf/lite_unittest.cc \ |
| 188 |
-@@ -867,11 +851,7 @@ $(am_protobuf_lite_test_OBJECTS): unittest_proto_middleman |
| 189 |
- # gtest when building the test internally our memory sanitizer doesn't detect |
| 190 |
- # memory leaks (don't know why). |
| 191 |
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
| 192 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
| 193 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
| 194 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
| 195 |
--protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ |
| 196 |
-- -I$(GOOGLETEST_SRC_DIR)/include |
| 197 |
-+ -lgtest -lgmock -lgmock_main |
| 198 |
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
| 199 |
- protobuf_lite_arena_test_SOURCES = \ |
| 200 |
- google/protobuf/lite_arena_unittest.cc \ |
| 201 |
-@@ -881,8 +861,7 @@ $(am_protobuf_lite_arena_test_OBJECTS): unittest_proto_middleman |
| 202 |
- |
| 203 |
- # Test plugin binary. |
| 204 |
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
| 205 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la |
| 206 |
--test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include |
| 207 |
-+ -lgtest |
| 208 |
- test_plugin_SOURCES = \ |
| 209 |
- google/protobuf/compiler/mock_code_generator.cc \ |
| 210 |
- google/protobuf/compiler/test_plugin.cc \ |
| 211 |
--- |
| 212 |
-2.34.1 |
| 213 |
- |
Archives