Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update googletest to latest git revision (#2218)

Browse Source 
* Update googletest to latest git revision
- update patch

* Fix sha256sums for the patch of googletest-git
This commit is contained in:
Diego Sogari
2017-02-26 12:33:08 -03:00
committed by Алексей
parent 65bbf443f0
commit 2e97e2ecfb
3 changed files with 49 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mingw-w64-googletest-git/PKGBUILD
View File

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-git
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=r932.0a43962
pkgver=r975.aa148eb
pkgrel=1
pkgdesc="Google Test (mingw-w64)"
arch=('any')
@@ -13,9 +13,9 @@ url="https://github.com/google/googletest"
license=('custom:BSD3')
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake")
source=("${_realname}::git+https://github.com/google/googletest.git"
"${_realname}-0a43962.patch")
"${_realname}-r975.aa148eb.patch")
sha256sums=('SKIP'
'a5d2f58a794b5cb99121a8b2ce2d98ac7e46e955653d78a4c9757b9783d1fe21')
'56e7f573ae511ddf450309d88f36d552e976595eab10984c4065c23a76c1ce74')
pkgver() {
cd "${srcdir}/${_realname}"
@@ -24,7 +24,7 @@ pkgver() {
prepare() {
cd "${srcdir}/${_realname}"
patch -Np1 -i "../${_realname}-0a43962.patch"
patch -Np1 -i "../${_realname}-r975.aa148eb.patch"
}
build() {
@@ -38,19 +38,11 @@ build() {
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DBUILD_SHARED_LIBS=ON \
-Dgtest_disable_pthreads=YES \
-Dgtest_build_tests=YES \
-Dgmock_build_tests=YES \
-Dgtest_build_samples=YES \
"../${_realname}"
make
}
check() {
cd "${srcdir}/build-${MINGW_CHOST}"
make test
}
package() {
cd "${srcdir}/build-${MINGW_CHOST}"
make DESTDIR="${pkgdir}" install

77
mingw-w64-googletest-git/googletest-0a43962.patch
View File

@@ -1,77 +0,0 @@
diff -r -c googletest.orig/googlemock/CMakeLists.txt googletest/googlemock/CMakeLists.txt
*** googletest.orig/googlemock/CMakeLists.txt 2016-05-27 21:52:30.900502400 -0300
--- googletest/googlemock/CMakeLists.txt 2016-05-27 21:41:13.527008600 -0300
***************
*** 104,110 ****
#
# Install rules
install(TARGETS gmock gmock_main
! DESTINATION lib)
install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
DESTINATION include)
--- 104,112 ----
#
# Install rules
install(TARGETS gmock gmock_main
! RUNTIME DESTINATION bin
! LIBRARY DESTINATION lib
! ARCHIVE DESTINATION lib)
install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
DESTINATION include)
***************
*** 123,128 ****
--- 125,134 ----
# This must be set in the root directory for the tests to be run by
# 'make test' or ctest.
enable_testing()
+
+ if (MINGW)
+ add_definitions(-O3 -Wa,-mbig-obj)
+ endif()
############################################################
# C++ tests built with standard compiler flags.
diff -r -c googletest.orig/googletest/CMakeLists.txt googletest/googletest/CMakeLists.txt
*** googletest.orig/googletest/CMakeLists.txt 2016-05-27 21:52:35.619587300 -0300
--- googletest/googletest/CMakeLists.txt 2016-05-27 21:41:27.463913700 -0300
***************
*** 103,109 ****
#
# Install rules
install(TARGETS gtest gtest_main
! DESTINATION lib)
install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
DESTINATION include)
--- 103,111 ----
#
# Install rules
install(TARGETS gtest gtest_main
! RUNTIME DESTINATION bin
! LIBRARY DESTINATION lib
! ARCHIVE DESTINATION lib)
install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
DESTINATION include)
diff -r -c googletest.orig/googletest/test/gtest_unittest.cc googletest/googletest/test/gtest_unittest.cc
*** googletest.orig/googletest/test/gtest_unittest.cc 2016-05-27 21:52:42.302942000 -0300
--- googletest/googletest/test/gtest_unittest.cc 2016-05-27 21:36:28.232024800 -0300
***************
*** 442,448 ****
// tzset() distinguishes between the TZ variable being present and empty
// and not being present, so we have to consider the case of time_zone
// being NULL.
! #if _MSC_VER
// ...Unless it's MSVC, whose standard library's _putenv doesn't
// distinguish between an empty and a missing variable.
const std::string env_var =
--- 442,448 ----
// tzset() distinguishes between the TZ variable being present and empty
// and not being present, so we have to consider the case of time_zone
// being NULL.
! #if _MSC_VER || defined __MINGW32__
// ...Unless it's MSVC, whose standard library's _putenv doesn't
// distinguish between an empty and a missing variable.
const std::string env_var =

45
mingw-w64-googletest-git/googletest-r975.aa148eb.patch Normal file
View File

@@ -0,0 +1,45 @@
diff -r -c googletest.orig/googlemock/CMakeLists.txt googletest/googlemock/CMakeLists.txt
*** googletest.orig/googlemock/CMakeLists.txt 2016-05-27 21:52:30.900502400 -0300
--- googletest/googlemock/CMakeLists.txt 2016-05-27 21:41:13.527008600 -0300
***************
*** 104,110 ****
#
# Install rules
install(TARGETS gmock gmock_main
! DESTINATION lib)
install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
DESTINATION include)
--- 104,112 ----
#
# Install rules
install(TARGETS gmock gmock_main
! RUNTIME DESTINATION bin
! LIBRARY DESTINATION lib
! ARCHIVE DESTINATION lib)
install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
DESTINATION include)
diff -r -c googletest.orig/googletest/CMakeLists.txt googletest/googletest/CMakeLists.txt
*** googletest.orig/googletest/CMakeLists.txt 2016-05-27 21:52:35.619587300 -0300
--- googletest/googletest/CMakeLists.txt 2016-05-27 21:41:27.463913700 -0300
***************
*** 103,109 ****
#
# Install rules
install(TARGETS gtest gtest_main
! DESTINATION lib)
install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
DESTINATION include)
--- 103,111 ----
#
# Install rules
install(TARGETS gtest gtest_main
! RUNTIME DESTINATION bin
! LIBRARY DESTINATION lib
! ARCHIVE DESTINATION lib)
install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
DESTINATION include)