summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen <eroen@occam.eroen.eu>2013-06-08 05:17:43 +0200
committereroen <eroen@occam.eroen.eu>2013-06-08 05:35:09 +0200
commit3754021b40b6bc48c7b9cc068fb1f689edf3108d (patch)
treeadeaace5f94ef8a314729be11dd0d9b2c0447fb8 /dev-cpp
parentgmock-1.6.0 from gentoo (diff)
downloaderoen-3754021b40b6bc48c7b9cc068fb1f689edf3108d.tar.gz
eroen-3754021b40b6bc48c7b9cc068fb1f689edf3108d.tar.bz2
eroen-3754021b40b6bc48c7b9cc068fb1f689edf3108d.zip
gmock-1.6.0: add tr1 use flag
This is useful, since gmock has a built-in emulation of the tr1 libs it uses, and libcxx doesn't provide tr1.
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/gmock/Manifest4
-rw-r--r--dev-cpp/gmock/gmock-1.6.0.ebuild11
-rw-r--r--dev-cpp/gmock/metadata.xml4
3 files changed, 14 insertions, 5 deletions
diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest
index 122af16..22d6dbb 100644
--- a/dev-cpp/gmock/Manifest
+++ b/dev-cpp/gmock/Manifest
@@ -1,3 +1,3 @@
DIST gmock-1.6.0.zip 2053682 SHA256 341ad07c31c619ba32c88c2265bc23693da1df062f47f146a7ed340f646d82b7 SHA512 7adff00bb6ff81a6ffb704be71d0747636d69e24b4a8b709e1fb8c177a9a47f6dea8d14fde73034ebfb1529c291c7212a944ad92a34f88abdfe23c2d0b11b6f7 WHIRLPOOL 1a03ff8f2d96287f5deb24f970688f20f3480e77a4a71089ef1399a87f28f616bf0feaedc217e7ac1ca8ca1246e53f5d882f350704be111ae547961949939530
-EBUILD gmock-1.6.0.ebuild 952 SHA256 1b99c8807a5d5c5b38729537979939171d24a64adfa08c146b3065759d7047ae SHA512 c8724c4c71173c54a48af457a76f3176fdb207d2122d05d3fb64a1a3a1211224e8687e28a9f17b16e3c89faf77dbf655c4f4408034e3d08d11d906671722e755 WHIRLPOOL df440ef467c415e8875e1cb760edba9c239738897b0b583aa13cef8fde94489b9e9c2ea75e386c88d0bf6ec8a0953a7331125e3eaae705bd77b5b794af82fda7
-MISC metadata.xml 283 SHA256 c34e015327f31293e860e8b2366e59e1d361c67f47d1c2cb010e16f43521a0f2 SHA512 e85ed05e67750a75476066754448e724ab3e65c91af152befff80c7f66423254311243fa213ba282bcc6456499964d4c969103cad829d8386ab3ef50138b5b81 WHIRLPOOL 3c504418a30332c69ad4282d204ff0ffeef35bc0aff4071d0c7f51704e7a1e091ce7e72826de354f8d1ded20920d61fa60bee4fafd3db8bd43acb9cdce9717bf
+EBUILD gmock-1.6.0.ebuild 1101 SHA256 70e1090754b64aa618f53aeef4a375916ee466f55538b5d59f603a66fc9c1f6d SHA512 a2a6ddb6df491be3bed4e5e6245d9fa8a55ee3593e250d18e4740cdf6c36320459c805e62951c06084a9f6bcd511a2023dbc5e205bdc108ed6d01be2397ca873 WHIRLPOOL d8e7f9057dc62db821a9be07857454c760963dcabd57cf6a894227a4d18fcf52995fb3bc17b4675409785d6b3e7d1e2e592e741cc31735aa4a16a9e3ba6a274a
+MISC metadata.xml 305 SHA256 3c99b8b3e68c1327c317a08e7ff8911eb2da88ad9c03bf7bb1c3a9ed16fa38af SHA512 c60717234e9725a81011bcfb6707426095929925ac415922235769033de2d09bf8b6ba5cf957901ad1921d27a5b3ef04dc72a6dc11962d0975f2f715e42572ad WHIRLPOOL 4abcee75c5cc59962b0df5c17f383e6cf59a33b68429d1b490ed994a4a830987b5042a49f09e9181e2bd71dfbf6b3a44919918577ec9588cbb25a1d318e4a5bd
diff --git a/dev-cpp/gmock/gmock-1.6.0.ebuild b/dev-cpp/gmock/gmock-1.6.0.ebuild
index 7862e80..42a2522 100644
--- a/dev-cpp/gmock/gmock-1.6.0.ebuild
+++ b/dev-cpp/gmock/gmock-1.6.0.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-inherit libtool
+inherit flag-o-matic libtool
DESCRIPTION="Google's C++ mocking framework"
HOMEPAGE="http://code.google.com/p/googlemock/"
@@ -13,12 +13,19 @@ SRC_URI="http://googlemock.googlecode.com/files/${P}.zip"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86"
-IUSE="static-libs"
+IUSE="static-libs +tr1"
RDEPEND="=dev-cpp/gtest-${PV}*"
DEPEND="app-arch/unzip
${RDEPEND}"
+pkg_setup() {
+ if ! use tr1; then
+ append-cflags -DGTEST_USE_OWN_TR1_TUPLE=1
+ append-cxxflags -DGTEST_USE_OWN_TR1_TUPLE=1
+ fi
+}
+
src_unpack() {
default
# make sure we always use the system one
diff --git a/dev-cpp/gmock/metadata.xml b/dev-cpp/gmock/metadata.xml
index 541e716..e016af3 100644
--- a/dev-cpp/gmock/metadata.xml
+++ b/dev-cpp/gmock/metadata.xml
@@ -2,9 +2,11 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
- <email>vapier@gentoo.org</email>
</maintainer>
<upstream>
<remote-id type="google-code">googlemock</remote-id>
</upstream>
+ <use>
+ <flag name=tr1>Use TR1 libraries</flag>
+ </use>
</pkgmetadata>