diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-cpp/gtest | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-cpp/gtest')
-rw-r--r-- | dev-cpp/gtest/Manifest | 2 | ||||
-rw-r--r-- | dev-cpp/gtest/files/configure-fix-pthread-linking.patch | 93 | ||||
-rw-r--r-- | dev-cpp/gtest/gtest-1.6.0-r1.ebuild | 60 | ||||
-rw-r--r-- | dev-cpp/gtest/gtest-1.6.0-r2.ebuild | 62 | ||||
-rw-r--r-- | dev-cpp/gtest/gtest-1.6.0.ebuild | 60 | ||||
-rw-r--r-- | dev-cpp/gtest/gtest-1.7.0.ebuild | 52 | ||||
-rw-r--r-- | dev-cpp/gtest/metadata.xml | 12 |
7 files changed, 341 insertions, 0 deletions
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest new file mode 100644 index 000000000000..20901f0fc571 --- /dev/null +++ b/dev-cpp/gtest/Manifest @@ -0,0 +1,2 @@ +DIST gtest-1.6.0.zip 1121697 SHA256 5ec97df8e75b4ee796604e74716d1b50582beba22c5502edd055a7e67a3965d8 SHA512 f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115 WHIRLPOOL 745a49020d4353ed2fa38adfc80bbd777358c831719bbe3b7c90d243f84256615222ba5f04d48d98b9e1a803bb40766799b3aedd575024c19d853d9239a12f8a +DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049 diff --git a/dev-cpp/gtest/files/configure-fix-pthread-linking.patch b/dev-cpp/gtest/files/configure-fix-pthread-linking.patch new file mode 100644 index 000000000000..75e5219b7a7c --- /dev/null +++ b/dev-cpp/gtest/files/configure-fix-pthread-linking.patch @@ -0,0 +1,93 @@ +From fb71154012e634a5e780e93af5434bcdafaf2b24 Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Mon, 15 Oct 2012 17:25:07 -0400 +Subject: [PATCH] configure: fix pthread linking + +- Update the pthread check to make sure that we don't need -lpthread when +compiling with -nostdlib. + +- Make sure that the necessary pthread library is passed to libtool. + +Fixes: + +$ ldd -r /usr/lib/libgtest.so + linux-vdso.so.1 (0x00007fffe7dff000) + libstdc++.so.6 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libstdc++.so.6 (0x00007fbe09a9f000) + libc.so.6 => /lib64/libc.so.6 (0x00007fbe096f7000) + libgcc_s.so.1 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libgcc_s.so.1 (0x00007fbe094e1000) + libm.so.6 => /lib64/libm.so.6 (0x00007fbe091ee000) + /lib64/ld-linux-x86-64.so.2 (0x00007fbe0a005000) +undefined symbol: pthread_key_create (/usr/lib/libgtest.so) +undefined symbol: pthread_getspecific (/usr/lib/libgtest.so) +undefined symbol: pthread_key_delete (/usr/lib/libgtest.so) +undefined symbol: pthread_setspecific (/usr/lib/libgtest.so) +--- + Makefile.am | 1 + + m4/acx_pthread.m4 | 39 ++++++++++++++++++++++++++++++++++++++- + 2 files changed, 39 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index cb350b7..db2606e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -181,6 +181,7 @@ endif + lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la + + lib_libgtest_la_SOURCES = src/gtest-all.cc ++lib_libgtest_la_LIBADD = $(AM_LIBS) + + pkginclude_HEADERS = \ + include/gtest/gtest-death-test.h \ +diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 +index 2cf20de..7fba4d9 100644 +--- a/m4/acx_pthread.m4 ++++ b/m4/acx_pthread.m4 +@@ -339,7 +339,44 @@ if test "x$acx_pthread_ok" = xyes; then + # so it's not safe to assume that we may use pthreads + acx_pthread_ok=no + fi +- ++ ++ AC_MSG_CHECKING([whether what we have so far is sufficient with -nostdlib]) ++ CFLAGS="-nostdlib $CFLAGS" ++ # we need c with nostdlib ++ LIBS="$LIBS -lc" ++ AC_TRY_LINK([#include <pthread.h>], ++ [pthread_t th; pthread_join(th, 0); ++ pthread_attr_init(0); pthread_cleanup_push(0, 0); ++ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], ++ [done=yes],[done=no]) ++ ++ if test "x$done" = xyes; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ ++ if test x"$done" = xno; then ++ AC_MSG_CHECKING([whether -lpthread saves the day]) ++ LIBS="-lpthread $LIBS" ++ AC_TRY_LINK([#include <pthread.h>], ++ [pthread_t th; pthread_join(th, 0); ++ pthread_attr_init(0); pthread_cleanup_push(0, 0); ++ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], ++ [done=yes],[done=no]) ++ ++ if test "x$done" = xyes; then ++ AC_MSG_RESULT([yes]) ++ PTHREAD_LIBS="$PTHREAD_LIBS -lpthread" ++ else ++ AC_MSG_RESULT([no]) ++ AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries and -nostdlib]) ++ fi ++ fi ++ ++ CFLAGS="$save_CFLAGS" ++ LIBS="$save_LIBS" ++ CC="$save_CC" + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" + CC="$save_CC" +-- +1.7.8.6 + diff --git a/dev-cpp/gtest/gtest-1.6.0-r1.ebuild b/dev-cpp/gtest/gtest-1.6.0-r1.ebuild new file mode 100644 index 000000000000..38bef885aee6 --- /dev/null +++ b/dev-cpp/gtest/gtest-1.6.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" +PYTHON_DEPEND="2" + +inherit eutils python autotools + +DESCRIPTION="Google C++ Testing Framework" +HOMEPAGE="http://code.google.com/p/googletest/" +SRC_URI="http://googletest.googlecode.com/files/${P}.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos" +IUSE="examples static-libs" + +DEPEND="app-arch/unzip" +RDEPEND="" + +pkg_setup() { + python_pkg_setup + python_set_active_version 2 +} + +src_prepare() { + sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die + sed -i -r \ + -e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \ + Makefile.am || die + epatch "${FILESDIR}"/configure-fix-pthread-linking.patch #371647 + eautoreconf + + python_convert_shebangs -r 2 . +} + +src_configure() { + econf \ + $(use_enable static-libs static) +} + +src_test() { + # explicitly use parallel make + emake check || die +} + +src_install() { + default + dobin scripts/gtest-config + + if ! use static-libs ; then + rm "${ED}"/usr/lib*/*.la || die + fi + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins samples/*.{cc,h} + fi +} diff --git a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild new file mode 100644 index 000000000000..2c3a158088f4 --- /dev/null +++ b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +# Python is required for tests and some build tasks. +PYTHON_COMPAT=( python2_7 ) + +inherit eutils python-any-r1 autotools-multilib + +DESCRIPTION="Google C++ Testing Framework" +HOMEPAGE="http://code.google.com/p/googletest/" +SRC_URI="http://googletest.googlecode.com/files/${P}.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="examples static-libs" + +DEPEND="app-arch/unzip + ${PYTHON_DEPS}" +RDEPEND="" + +PATCHES=( + "${FILESDIR}/configure-fix-pthread-linking.patch" #371647 +) + +AUTOTOOLS_AUTORECONF="1" + +src_prepare() { + sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die + sed -i -r \ + -e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \ + Makefile.am || die + autotools-multilib_src_prepare + + multilib_copy_sources +} + +src_configure() { + multilib_parallel_foreach_abi gtest_src_configure +} + +src_install() { + autotools-multilib_src_install + multilib_for_best_abi gtest-config_install + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins samples/*.{cc,h} + fi +} + +gtest_src_configure() { + ECONF_SOURCE="${BUILD_DIR}" + autotools-utils_src_configure +} + +gtest-config_install() { + dobin "${BUILD_DIR}/scripts/gtest-config" +} diff --git a/dev-cpp/gtest/gtest-1.6.0.ebuild b/dev-cpp/gtest/gtest-1.6.0.ebuild new file mode 100644 index 000000000000..12d5c0c52550 --- /dev/null +++ b/dev-cpp/gtest/gtest-1.6.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" +PYTHON_DEPEND="2" + +inherit python libtool + +DESCRIPTION="Google C++ Testing Framework" +HOMEPAGE="http://code.google.com/p/googletest/" +SRC_URI="http://googletest.googlecode.com/files/${P}.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos" +IUSE="examples threads static-libs" + +DEPEND="app-arch/unzip" +RDEPEND="" + +pkg_setup() { + python_pkg_setup + python_set_active_version 2 +} + +src_prepare() { + sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die + sed -i -r \ + -e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \ + Makefile.in + elibtoolize + + python_convert_shebangs -r 2 . +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with threads pthreads) +} + +src_test() { + # explicitly use parallel make + emake check || die +} + +src_install() { + default + dobin scripts/gtest-config + + if ! use static-libs ; then + rm "${ED}"/usr/lib*/*.la || die + fi + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins samples/*.{cc,h} + fi +} diff --git a/dev-cpp/gtest/gtest-1.7.0.ebuild b/dev-cpp/gtest/gtest-1.7.0.ebuild new file mode 100644 index 000000000000..e593cf687e95 --- /dev/null +++ b/dev-cpp/gtest/gtest-1.7.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 +# Python is required for tests and some build tasks. +PYTHON_COMPAT=( python2_7 ) + +inherit eutils python-any-r1 autotools-multilib + +DESCRIPTION="Google C++ Testing Framework" +HOMEPAGE="http://code.google.com/p/googletest/" +SRC_URI="http://googletest.googlecode.com/files/${P}.zip" + +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 static-libs" + +DEPEND="app-arch/unzip + ${PYTHON_DEPS}" +RDEPEND="" + +PATCHES=( + "${FILESDIR}/configure-fix-pthread-linking.patch" #371647 +) + +src_prepare() { + sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die + sed -i -r \ + -e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \ + Makefile.am || die + autotools-multilib_src_prepare +} + +multilib_src_install() { + default + multilib_is_native_abi && dobin scripts/gtest-config +} + +multilib_src_install_all() { + prune_libtool_files --all + einstalldocs + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins samples/*.{cc,h} + fi +} diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml new file mode 100644 index 000000000000..00270970185b --- /dev/null +++ b/dev-cpp/gtest/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>tomka@gentoo.org</email> + <name>Thomas Kahle</name> + </maintainer> + <upstream> + <doc lang="en">http://code.google.com/p/googletest/w/list</doc> + <remote-id type="google-code">googletest</remote-id> + </upstream> +</pkgmetadata> |