From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 226521396D2 for ; Tue, 29 Aug 2017 20:30:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 921DDE0CB6; Tue, 29 Aug 2017 20:30:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60248E0CB6 for ; Tue, 29 Aug 2017 20:30:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F033333BEA7 for ; Tue, 29 Aug 2017 20:30:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AECC2871A for ; Tue, 29 Aug 2017 20:30:22 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1504038615.fb37bc926a630ca175bc424843d57fe9d21a8f0a.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/, dev-cpp/gtest/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/gtest/Manifest dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch dev-cpp/gtest/gtest-1.8.0.ebuild X-VCS-Directories: dev-cpp/gtest/ dev-cpp/gtest/files/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: fb37bc926a630ca175bc424843d57fe9d21a8f0a X-VCS-Branch: master Date: Tue, 29 Aug 2017 20:30:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1c74eddc-11e7-4cad-9f01-689c9d8107de X-Archives-Hash: 0918542ec08dce3f231f8562e781134a commit: fb37bc926a630ca175bc424843d57fe9d21a8f0a Author: Peter Levine gmail com> AuthorDate: Mon Aug 21 01:48:10 2017 +0000 Commit: Patrice Clement gentoo org> CommitDate: Tue Aug 29 20:30:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb37bc92 dev-cpp/gtest: version bump to 1.8.0. Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=602218 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-cpp/gtest/Manifest | 1 + .../gtest/files/gtest-1.8.0-multilib-strict.patch | 40 +++++++++++++++ dev-cpp/gtest/gtest-1.8.0.ebuild | 59 ++++++++++++++++++++++ 3 files changed, 100 insertions(+) diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest index df31d40d6a7..0bc58c544eb 100644 --- a/dev-cpp/gtest/Manifest +++ b/dev-cpp/gtest/Manifest @@ -1 +1,2 @@ DIST gtest-1.7.0.tar.gz 1001582 SHA256 c0f860eee47c86e0aeb462fd0bdfd70e3975297e0b8b178e0e03a95e1f6c9bc4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3 WHIRLPOOL 36edbdf8be7c3793a89918a3c43d74e75a6281a37c394f7d2f20506130a76aab04a3beddba01bf7f0e9b6901c7e834ca014c31c913c0ea846d3f6be9c93599d2 +DIST gtest-1.8.0.tar.gz 1281617 SHA256 58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d WHIRLPOOL 7d95c06818332f9596dbda03d21416012c00e05c78be0814279ab9e7059b9d836060bab83ad46d013ccf1ba40973680c0793d78ac22f6016773fd93aa97b779b diff --git a/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch b/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch new file mode 100644 index 00000000000..c18b58e16fb --- /dev/null +++ b/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch @@ -0,0 +1,40 @@ +--- a/googlemock/CMakeLists.txt ++++ b/googlemock/CMakeLists.txt +@@ -11,6 +11,8 @@ + + option(gmock_build_tests "Build all of Google Mock's own tests." OFF) + ++set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory") ++ + # A directory to find Google Test sources. + if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt") + set(gtest_dir gtest) +@@ -104,7 +106,7 @@ + # + # Install rules + install(TARGETS gmock gmock_main +- DESTINATION lib) ++ DESTINATION ${LIB_INSTALL_DIR}) + install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock + DESTINATION include) + +--- a/googletest/CMakeLists.txt ++++ b/googletest/CMakeLists.txt +@@ -27,6 +27,8 @@ + "Build gtest with internal symbols hidden in shared libraries." + OFF) + ++set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory") ++ + # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build(). + include(cmake/hermetic_build.cmake OPTIONAL) + +@@ -103,7 +105,7 @@ + # + # Install rules + install(TARGETS gtest gtest_main +- DESTINATION lib) ++ DESTINATION ${LIB_INSTALL_DIR}) + install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest + DESTINATION include) + diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild new file mode 100644 index 00000000000..308a12ff6fd --- /dev/null +++ b/dev-cpp/gtest/gtest-1.8.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Python is required for tests and some build tasks. +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) + +inherit python-any-r1 cmake-multilib + +DESCRIPTION="Google C++ Testing Framework" +HOMEPAGE="https://github.com/google/googletest" +SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="examples test" + +DEPEND="test? ( ${PYTHON_DEPS} )" +RDEPEND="!dev-cpp/gmock" + +PATCHES=( + "${FILESDIR}"/${PN}-9999-fix-py-tests.patch + "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch + "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch +) + +S="${WORKDIR}"/googletest-release-${PV} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_GMOCK=ON + -DBUILD_GTEST=ON + -DLIB_INSTALL_DIR=$(get_libdir) + -Dgtest_build_samples=OFF + -Dgtest_disable_pthreads=OFF + -DBUILD_SHARED_LIBS=ON + + # tests + -Dgmock_build_tests=$(usex test) + -Dgtest_build_tests=$(usex test) + -DPYTHON_EXECUTABLE="${PYTHON}" + ) + cmake-utils_src_configure mycmakeargs +} + +multilib_src_install_all() { + einstalldocs + + if use examples; then + docinto examples + dodoc googletest/samples/*.{cc,h} + fi +}