[packages/gtest/DEVEL-1.10] - updated to 1.10.0 - removed outdated install,link,gmock-install,version patches; autotools support
qboosh
qboosh at pld-linux.org
Thu Mar 5 18:19:33 CET 2020
commit 197e2f8ab07c900c31047e288594fbd6dc84f626
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Mar 5 18:19:36 2020 +0100
- updated to 1.10.0
- removed outdated install,link,gmock-install,version patches; autotools support is now gone
- switched to unofficial cmake support (bazel is hard to get it to work in PLD)
- added libversion patch to install versioned libraries
- try to package built libgmock, might be usable now
- gtest and gmock sources moved to *-src packages
gmock-install.patch | 106 -----------------------
gtest-install.patch | 30 -------
gtest-libversion.patch | 25 ++++++
gtest-link.patch | 10 ---
gtest-version.patch | 42 ---------
gtest.spec | 228 +++++++++++++++++++++++++++++++------------------
6 files changed, 170 insertions(+), 271 deletions(-)
---
diff --git a/gtest.spec b/gtest.spec
index 149a274..debd5a7 100644
--- a/gtest.spec
+++ b/gtest.spec
@@ -1,26 +1,22 @@
#
# Conditional build:
-%bcond_without tests # do not perform "make check"
+%bcond_with tests # unit tests (supported only using bazel)
+%bcond_without static_libs # static libraries
#
Summary: Google C++ testing framework
Summary(pl.UTF-8): Szkielet testów w C++ stworzony przez Google
Name: gtest
-Version: 1.8.1
-Release: 3
+Version: 1.10.0
+Release: 1
License: BSD
Group: Development/Tools
#Source0Download: https://github.com/google/googletest/releases
Source0: https://github.com/google/googletest/archive/release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 2e6fbeb6a91310a16efe181886c59596
-Patch0: %{name}-install.patch
-Patch1: %{name}-link.patch
-Patch2: gmock-install.patch
-Patch3: %{name}-version.patch
+# Source0-md5: ecd1fa65e7de707cd5c00bdac56022cd
+Patch0: %{name}-libversion.patch
URL: https://github.com/google/googletest
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake >= 1:1.9
-BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:1.5
+BuildRequires: cmake >= 2.8.8
+BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: python >= 2.3
BuildRequires: python-modules >= 2.3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,7 +43,7 @@ Summary: Development files for gtest framework
Summary(pl.UTF-8): Pliki programistyczne szkieletu gtest
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libstdc++-devel
+Requires: libstdc++-devel >= 6:4.7
%description devel
This package contains development files for gtest framework.
@@ -67,16 +63,25 @@ Static gtest libraries.
%description static -l pl.UTF-8
Statyczne biblioteki gtest.
-%package -n gmock-devel
+%package src
+Summary: Source code of gtest framework
+Summary(pl.UTF-8): Kod źródłowy szkieletu gtest
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description src
+Source code of gtest framework for embedding it in other projects.
+
+%description src -l pl.UTF-8
+Kod źródłowy szkieletu gtest do osadzania go w innych projektach.
+
+%package -n gmock
Summary: Google C++ Mocking Framework
Summary(pl.UTF-8): Szkielet Google Mock dla C++
-Group: Development/Libraries
-Requires: gtest-devel = %{version}-%{release}
-Requires: libstdc++-devel
-Provides: gmock = %{version}-%{release}
-Obsoletes: gmock < 1.6.0-3
+Group: Libraries
+Requires: gtest = %{version}-%{release}
-%description -n gmock-devel
+%description -n gmock
Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s
specifics in mind, Google C++ Mocking Framework (or Google Mock for
short) is a library for writing and using C++ mock classes.
@@ -90,7 +95,7 @@ Google Mock:
- works on Linux, Mac OS X, Windows, Windows Mobile, minGW, and
Symbian.
-%description -n gmock-devel -l pl.UTF-8
+%description -n gmock -l pl.UTF-8
Google C++ Mocking Framework (w skrócie Google Mock) to zainspirowana
przez jMock, EasyMock i Hamcrest, zaprojektowana z myślą o specyfice
C++ biblioteka do pisania i wykorzystywania klas "mock" w C++.
@@ -104,80 +109,114 @@ Google Mock:
- działa na Linuksie, Mac OS X, Windows, Windows Mobile, minGW oraz
Symbianie.
+%package -n gmock-devel
+Summary: Development files for gmock framework
+Summary(pl.UTF-8): Pliki programistyczne szkieletu gmock
+Group: Development/Libraries
+Requires: gmock = %{version}-%{release}
+Requires: gtest-devel = %{version}-%{release}
+
+%description -n gmock-devel
+This package contains development files for gmock framework.
+
+%description -n gmock-devel -l pl.UTF-8
+Ten pakiet zawiera pliki programistyczne szkieletu gmock.
+
+%package -n gmock-static
+Summary: Static gmock libraries
+Summary(pl.UTF-8): Statyczne biblioteki gmock
+Group: Development/Libraries
+Requires: gmock-devel = %{version}-%{release}
+
+%description -n gmock-static
+Static gmock libraries.
+
+%description -n gmock-static -l pl.UTF-8
+Statyczne biblioteki gmock.
+
+%package -n gmock-src
+Summary: Source code of gmock framework
+Summary(pl.UTF-8): Kod źródłowy szkieletu gmock
+Group: Development/Libraries
+Requires: %{name}-src = %{version}-%{release}
+Requires: gmock-devel = %{version}-%{release}
+
+%description -n gmock-src
+Source code of gmock framework for embedding it in other projects.
+
+%description -n gmock-src -l pl.UTF-8
+Kod źródłowy szkieletu gmock do osadzania go w innych projektach.
%prep
%setup -q -n googletest-release-%{version}
-%patch3 -p1
-
-cd googletest
%patch0 -p1
-%patch1 -p1
-# Keep a clean copy of samples.
-cp -a samples examples
-
-cd ../googlemock
-%patch2 -p1
-grep -rl bin/env scripts | xargs %{__sed} -i -e '1s,^#!.*python,#!%{__python},'
+grep -rl 'bin/env python' googlemock/scripts | xargs %{__sed} -i -e '1s,^#!.*python,#!%{__python},'
%build
-cd googletest
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
-
+# Note: official build system is now Bazel - but it's extremely distro unfriendly.
+# Use unofficial, community maintained CMake suite.
+%if %{with static_libs}
+install -d build-static
+cd build-static
+%cmake .. \
+ -DBUILD_SHARED_LIBS=OFF
%{__make}
+cd ..
+%endif
-%{?with_tests:%{__make} check}
-
-cd ../googlemock
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- GTEST_CONFIG=../googletest/scripts/gtest-config \
- GTEST_CPPFLAGS="-I$PWD/../googletest/include" \
- GTEST_LDFLAGS="-L$PWD/../googletest/lib/.libs" \
+install -d build
+cd build
+%cmake ..
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-cd googletest
-%{__make} -j1 install \
- INSTALL="%{__install} -p" \
+%if %{with static_libs}
+%{__make} -C build-static install \
DESTDIR=$RPM_BUILD_ROOT
+%endif
-install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-for f in gtest.pc gtest_main.pc ; do
- %{__sed} -e 's, at CMAKE_INSTALL_FULL_LIBDIR@,%{_libdir},' \
- -e 's, at CMAKE_INSTALL_FULL_INCLUDEDIR@,%{_includedir},' \
- -e 's, at PROJECT_VERSION@,%{version},' \
- -e 's, at CMAKE_THREAD_LIBS_INIT@,-pthread,' \
- -e 's, at GTEST_HAS_PTHREAD_MACRO@,-DGTEST_HAS_PTHREAD=1,' \
- cmake/${f}.in >$RPM_BUILD_ROOT%{_pkgconfigdir}/${f}
-done
-
-install -Dp scripts/gtest-config $RPM_BUILD_ROOT%{_bindir}/gtest-config
-
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install -d $RPM_BUILD_ROOT%{_prefix}/src/gtest/src
-cp -p src/*.{cc,h} $RPM_BUILD_ROOT%{_prefix}/src/gtest/src
-cp -pr CMakeLists.txt cmake $RPM_BUILD_ROOT%{_prefix}/src/gtest
-
-cd ../googlemock
-%{__make} -j1 install \
- INSTALL="%{__install} -p" \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/gmock/generator/{README.cppclean,LICENSE,README}
+install -d $RPM_BUILD_ROOT%{_bindir}
+%{__sed} -e 's, at PACKAGE_TARNAME@,gtest,' \
+ -e 's, at PACKAGE_VERSION@,%{version},' \
+ -e 's, at prefix@,%{_prefix},' \
+ -e 's, at exec_prefix@,%{_exec_prefix},' \
+ -e 's, at bindir@,%{_bindir},' \
+ -e 's, at libdir@,%{_libdir},' \
+ -e 's, at includedir@,%{_includedir},' \
+ -e 's, at top_srcdir@,%{_prefix}/src/gtest,' \
+ -e 's, at PTHREAD_CFLAGS@,-pthread,' \
+ -e 's, at PTHREAD_LIBS@,-lpthread,' \
+ googletest/scripts/gtest-config.in > $RPM_BUILD_ROOT%{_bindir}/gtest-config
+
+install -d $RPM_BUILD_ROOT%{_prefix}/src/gtest
+cp -pr googletest/{cmake,src,CMakeLists.txt} $RPM_BUILD_ROOT%{_prefix}/src/gtest
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p googletest/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+install -d $RPM_BUILD_ROOT%{_datadir}/gmock/generator
+cp -pr googlemock/scripts/generator/{cpp,gmock_gen.py} $RPM_BUILD_ROOT%{_datadir}/gmock/generator
+
+%{__sed} -e 's, at PACKAGE_TARNAME@,gmock,' \
+ -e 's, at PACKAGE_VERSION@,%{version},' \
+ -e 's, at prefix@,%{_prefix},' \
+ -e 's, at exec_prefix@,%{_exec_prefix},' \
+ -e 's, at bindir@,%{_bindir},' \
+ -e 's, at libdir@,%{_libdir},' \
+ -e 's, at includedir@,%{_includedir},' \
+ -e 's, at top_srcdir@,%{_prefix}/src/gmock,' \
+ -e 's, at GTEST_CONFIG@,%{_bindir}/gtest-config,' \
+ -e 's, at GTEST_VERSION@,%{version},' \
+ googlemock/scripts/gmock-config.in > $RPM_BUILD_ROOT%{_bindir}/gmock-config
+
+install -d $RPM_BUILD_ROOT%{_prefix}/src/gmock
+cp -pr googlemock/{cmake,src,CMakeLists.txt} $RPM_BUILD_ROOT%{_prefix}/src/gmock
# gmock CMakeLists.txt expects gtest or ../googletest accessile
ln -snf ../gtest $RPM_BUILD_ROOT%{_prefix}/src/gmock/gtest
@@ -189,7 +228,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc googletest/{CHANGES,CONTRIBUTORS,LICENSE,README.md}
+%doc googletest/{CONTRIBUTORS,LICENSE,README.md}
%attr(755,root,root) %{_libdir}/libgtest.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgtest.so.0
%attr(755,root,root) %{_libdir}/libgtest_main.so.*.*.*
@@ -200,29 +239,52 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/gtest-config
%attr(755,root,root) %{_libdir}/libgtest.so
%attr(755,root,root) %{_libdir}/libgtest_main.so
-%{_libdir}/libgtest.la
-%{_libdir}/libgtest_main.la
%{_includedir}/gtest
%{_pkgconfigdir}/gtest.pc
%{_pkgconfigdir}/gtest_main.pc
-%{_aclocaldir}/gtest.m4
-%{_prefix}/src/gtest
+%{_libdir}/cmake/GTest
%{_examplesdir}/%{name}-%{version}
+%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/libgtest.a
%{_libdir}/libgtest_main.a
+%endif
+
+%files src
+%defattr(644,root,root,755)
+%{_prefix}/src/gtest
+
+%files -n gmock
+%defattr(644,root,root,755)
+%doc googlemock/{CONTRIBUTORS,LICENSE,README.md}
+%attr(755,root,root) %{_libdir}/libgmock.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgmock.so.0
+%attr(755,root,root) %{_libdir}/libgmock_main.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgmock_main.so.0
%files -n gmock-devel
%defattr(644,root,root,755)
-%doc googlemock/{CHANGES,CONTRIBUTORS,LICENSE,README.md}
%attr(755,root,root) %{_bindir}/gmock-config
+%attr(755,root,root) %{_libdir}/libgmock.so
+%attr(755,root,root) %{_libdir}/libgmock_main.so
%{_includedir}/gmock
-%{_npkgconfigdir}/gmock.pc
+%{_pkgconfigdir}/gmock.pc
+%{_pkgconfigdir}/gmock_main.pc
%dir %{_datadir}/gmock
%dir %{_datadir}/gmock/generator
%attr(755,root,root) %{_datadir}/gmock/generator/gmock_gen.py
%dir %{_datadir}/gmock/generator/cpp
%attr(755,root,root) %{_datadir}/gmock/generator/cpp/*.py
+
+%if %{with static_libs}
+%files -n gmock-static
+%defattr(644,root,root,755)
+%{_libdir}/libgmock.a
+%{_libdir}/libgmock_main.a
+%endif
+
+%files -n gmock-src
+%defattr(644,root,root,755)
%{_prefix}/src/gmock
diff --git a/gmock-install.patch b/gmock-install.patch
deleted file mode 100644
index 401ab8e..0000000
--- a/gmock-install.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- googlemock-1.8.0/Makefile.am.orig 2016-07-14 19:15:38.000000000 +0200
-+++ googlemock-1.8.0/Makefile.am 2016-09-25 12:10:16.229204517 +0200
-@@ -7,6 +7,9 @@
- # included in the 'subdirs' variable.
- SUBDIRS = $(subdirs)
-
-+
-+bin_SCRIPTS = scripts/gmock-config
-+
- # This is generated by the configure script, so clean it for distribution.
- DISTCLEANFILES = scripts/gmock-config
-
-@@ -21,10 +24,13 @@
- endif
-
- # Build rules for libraries.
--lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la
-+check_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la
-
--lib_libgmock_la_SOURCES = src/gmock-all.cc
-+nodist_lib_libgmock_la_SOURCES = src/gmock-all.cc
-
-+pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfig_DATA = gmock.pc
-+
- pkginclude_HEADERS = \
- include/gmock/gmock-actions.h \
- include/gmock/gmock-cardinalities.h \
-@@ -42,12 +48,14 @@
- pkginclude_internal_HEADERS = \
- include/gmock/internal/gmock-generated-internal-utils.h \
- include/gmock/internal/gmock-internal-utils.h \
-- include/gmock/internal/gmock-port.h \
-+ include/gmock/internal/gmock-port.h
-+pkginclude_internalcustomdir = $(pkgincludedir)/internal/custom
-+pkginclude_internalcustom_HEADERS = \
- include/gmock/internal/custom/gmock-generated-actions.h \
- include/gmock/internal/custom/gmock-matchers.h \
- include/gmock/internal/custom/gmock-port.h
-
--lib_libgmock_main_la_SOURCES = src/gmock_main.cc
-+nodist_lib_libgmock_main_la_SOURCES = src/gmock_main.cc
- lib_libgmock_main_la_LIBADD = lib/libgmock.la
-
- # Build rules for tests. Automake's naming for some of these variables isn't
-@@ -192,8 +200,8 @@
-
- # TODO(vladl at google.com): Find a way to add Google Tests's sources here.
- fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
-- $(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \
-- $(lib_libgmock_main_la_SOURCES) \
-+ $(nodist_lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \
-+ $(nodist_lib_libgmock_main_la_SOURCES) \
- scripts/fuse_gmock_files.py
- mkdir -p "$(srcdir)/fused-src"
- chmod -R u+w "$(srcdir)/fused-src"
-@@ -215,10 +223,9 @@
- # Mock can lead to undefined behavior due to violation of the
- # One-Definition Rule.
-
--install-exec-local:
-- echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
-- false
--
--install-data-local:
-- echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
-- false
-+install-exec-hook:
-+ mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@ $(DESTDIR)$(prefix)/src/@PACKAGE@/src
-+ cp -rf scripts/generator $(DESTDIR)$(datadir)/@PACKAGE@
-+ cp -f src/* $(DESTDIR)$(prefix)/src/@PACKAGE@/src
-+ cp -f CMakeLists.txt $(DESTDIR)$(prefix)/src/@PACKAGE@
-+ sed -i s/src[/]//g $(DESTDIR)$(prefix)/src/@PACKAGE@/src/gmock-all.cc
-diff --git a/configure.ac b/configure.ac
-index e8b65bd..9ec7743 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_PREREQ([2.59])
- AC_CONFIG_SRCDIR([./COPYING])
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_HEADERS([build-aux/config.h])
--AC_CONFIG_FILES([Makefile])
-+AC_CONFIG_FILES([Makefile gmock.pc])
- AC_CONFIG_FILES([scripts/gmock-config], [chmod +x scripts/gmock-config])
-
- # Initialize Automake with various options. We require at least v1.9, prevent
-diff --git a/gmock.pc.in b/gmock.pc.in
-new file mode 100644
-index 0000000..da4b6c4
---- /dev/null
-+++ b/gmock.pc.in
-@@ -0,0 +1,14 @@
-+#############################
-+# Pkg-Config file for gmock #
-+#############################
-+
-+Name: gmock
-+Description: Google C++ mocking framework
-+URL: https://code.google.com/p/googlemock/
-+Version: @VERSION@
-+
-+prefix=@prefix@
-+includedir=@includedir@
-+srcdir=@prefix@/src/gmock
-+
-+Cflags: -I${includedir}/gmock
diff --git a/gtest-install.patch b/gtest-install.patch
deleted file mode 100644
index f50f800..0000000
--- a/gtest-install.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- googletest-1.8.0/Makefile.am.orig 2011-04-15 21:49:12.000000000 +0200
-+++ googletest-1.8.0/Makefile.am 2011-06-16 13:08:22.272743192 +0200
-@@ -209,7 +209,10 @@
- include/gtest/internal/gtest-port-arch.h \
- include/gtest/internal/gtest-string.h \
- include/gtest/internal/gtest-tuple.h \
-- include/gtest/internal/gtest-type-util.h \
-+ include/gtest/internal/gtest-type-util.h
-+
-+pkginclude_internalcustomdir = $(pkgincludedir)/internal/custom
-+pkginclude_internalcustom_HEADERS = \
- include/gtest/internal/custom/gtest.h \
- include/gtest/internal/custom/gtest-port.h \
- include/gtest/internal/custom/gtest-printers.h
-@@ -288,15 +288,3 @@
- # Death tests may produce core dumps in the build directory. In case
- # this happens, clean them to keep distcleancheck happy.
- CLEANFILES = core
--
--# Disables 'make install' as installing a compiled version of Google
--# Test can lead to undefined behavior due to violation of the
--# One-Definition Rule.
--
--install-exec-local:
-- echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
-- false
--
--install-data-local:
-- echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
-- false
diff --git a/gtest-libversion.patch b/gtest-libversion.patch
new file mode 100644
index 0000000..16f11d0
--- /dev/null
+++ b/gtest-libversion.patch
@@ -0,0 +1,25 @@
+--- googletest-release-1.10.0/googlemock/CMakeLists.txt.orig 2019-10-03 16:52:15.000000000 +0200
++++ googletest-release-1.10.0/googlemock/CMakeLists.txt 2020-02-28 18:49:56.774541882 +0100
+@@ -100,8 +100,10 @@
+ else()
+ cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
+ target_link_libraries(gmock PUBLIC gtest)
++ set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION} SOVERSION 0)
+ cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
+ target_link_libraries(gmock_main PUBLIC gmock)
++ set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION} SOVERSION 0)
+ endif()
+ # If the CMake version supports it, attach header directory information
+ # to the targets for when we are part of a parent build (ie being pulled
+--- googletest-release-1.10.0/googletest/CMakeLists.txt.orig 2020-02-28 18:58:56.451618201 +0100
++++ googletest-release-1.10.0/googletest/CMakeLists.txt 2020-02-28 18:58:59.334935914 +0100
+@@ -126,7 +126,9 @@
+ # are used for other targets, to ensure that gtest can be compiled by a user
+ # aggressive about warnings.
+ cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
++set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION} SOVERSION 0)
+ cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
++set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION} SOVERSION 0)
+ # If the CMake version supports it, attach header directory information
+ # to the targets for when we are part of a parent build (ie being pulled
+ # in via add_subdirectory() rather than being a standalone build).
diff --git a/gtest-link.patch b/gtest-link.patch
deleted file mode 100644
index abdc864..0000000
--- a/gtest-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtest-1.6.0/Makefile.am.orig 2011-06-16 13:10:10.212746806 +0200
-+++ gtest-1.6.0/Makefile.am 2011-06-16 14:09:29.259532641 +0200
-@@ -181,6 +181,7 @@
- lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
-
- lib_libgtest_la_SOURCES = src/gtest-all.cc
-+lib_libgtest_la_LIBADD = -lpthread
-
- pkginclude_HEADERS = \
- include/gtest/gtest-death-test.h \
diff --git a/gtest-version.patch b/gtest-version.patch
deleted file mode 100644
index d8ac615..0000000
--- a/gtest-version.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- googletest-release-1.8.1/configure.ac.orig 2018-08-31 17:21:57.000000000 +0200
-+++ googletest-release-1.8.1/configure.ac 2018-10-16 16:34:16.015945823 +0200
-@@ -1,5 +1,5 @@
- AC_INIT([Google C++ Mocking and Testing Frameworks],
-- [1.8.0],
-+ [1.8.1],
- [googlemock at googlegroups.com],
- [googletest])
-
---- googletest-release-1.8.1/CMakeLists.txt.orig 2018-08-31 17:21:57.000000000 +0200
-+++ googletest-release-1.8.1/CMakeLists.txt 2018-10-16 16:34:29.929279000 +0200
-@@ -5,7 +5,7 @@
- endif (POLICY CMP0048)
-
- project(googletest-distribution)
--set(GOOGLETEST_VERSION 1.9.0)
-+set(GOOGLETEST_VERSION 1.8.1)
-
- enable_testing()
-
---- googletest-release-1.8.1/googletest/configure.ac.orig 2018-08-31 17:21:57.000000000 +0200
-+++ googletest-release-1.8.1/googletest/configure.ac 2018-10-16 16:32:10.055947264 +0200
-@@ -5,7 +5,7 @@
- # "[1.0.1]"). It also asumes that there won't be any closing parenthesis
- # between "AC_INIT(" and the closing ")" including comments and strings.
- AC_INIT([Google C++ Testing Framework],
-- [1.8.0],
-+ [1.8.1],
- [googletestframework at googlegroups.com],
- [gtest])
-
---- googletest-release-1.8.1/googlemock/configure.ac.orig 2018-10-16 16:29:59.762615418 +0200
-+++ googletest-release-1.8.1/googlemock/configure.ac 2018-10-16 16:34:39.462612224 +0200
-@@ -1,7 +1,7 @@
- m4_include(../googletest/m4/acx_pthread.m4)
-
- AC_INIT([Google C++ Mocking Framework],
-- [1.8.0],
-+ [1.8.1],
- [googlemock at googlegroups.com],
- [gmock])
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtest.git/commitdiff/197e2f8ab07c900c31047e288594fbd6dc84f626
More information about the pld-cvs-commit
mailing list