diff options
Diffstat (limited to 'dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch')
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch b/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch deleted file mode 100644 index 341d1128aa1a..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2015-12-30 22:21:46.000000000 +0100 -+++ b/configure.ac 2016-04-16 17:46:54.858904639 +0200 -@@ -176,9 +176,9 @@ - # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, - # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock - # too. --export CFLAGS --export CXXFLAGS --AC_CONFIG_SUBDIRS([gmock]) -+#export CFLAGS -+#export CXXFLAGS -+#AC_CONFIG_SUBDIRS([gmock]) - - AC_CONFIG_FILES([Makefile src/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) - AC_OUTPUT -diff -Naur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2015-12-30 22:21:46.000000000 +0100 -+++ b/Makefile.am 2016-04-16 17:46:25.355751203 +0200 -@@ -17,9 +17,10 @@ - # want "make install" to recurse into gmock since we don't want to overwrite - # the installed version of gmock if there is one. - check-local: -- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la -+ @echo "Making of gmock disabled" -+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la - - # We would like to clean gmock when "make clean" is invoked. But we have to - # be careful because clean-local is also invoked during "make distclean", but -diff -Naur a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2015-12-30 22:21:46.000000000 +0100 -+++ b/src/Makefile.am 2016-04-16 17:47:07.026967535 +0200 -@@ -669,11 +669,8 @@ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ - $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ -- -I$(srcdir)/../gmock/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_test_CPPFLAGS = -I/usr/include - # Disable optimization for tests unless the user explicitly asked for it, - # since test_util.cc takes forever to compile with optimization (with GCC). - # See configure.ac for more info. -@@ -753,11 +750,8 @@ - # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. - protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ - libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include \ -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \ - -DPROTOBUF_TEST_NO_DESCRIPTORS - protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lazy_descriptor_test_SOURCES = \ -@@ -788,11 +782,8 @@ - # gtest when building the test internally our memory sanitizer doesn't detect - # memory leaks (don't know why). - protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include - protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_arena_test_SOURCES = \ - google/protobuf/lite_arena_unittest.cc \ -@@ -801,8 +792,8 @@ - - # Test plugin binary. - test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la --test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgtest -+test_plugin_CPPFLAGS = -I/usr/include - test_plugin_SOURCES = \ - google/protobuf/compiler/mock_code_generator.cc \ - google/protobuf/testing/file.cc \ |