diff options
| author |   eroen <eroen@occam.eroen.eu> | 2013-06-08 05:17:43 +0200 |
|---|---|---|
| committer | eroen <eroen@occam.eroen.eu> | 2013-06-08 05:17:43 +0200 |
| commit | 5e730379fb53044a677754fbf6415eb2b7f1ec47 (patch) | |
| tree | e2fa817fb6963b14f9ed068759a3f7e251c2f1eb | |
| parent | gtest-1.6.0-r2 from gentoo (diff) | |
| download | eroen-5e730379fb53044a677754fbf6415eb2b7f1ec47.tar.gz eroen-5e730379fb53044a677754fbf6415eb2b7f1ec47.tar.bz2 eroen-5e730379fb53044a677754fbf6415eb2b7f1ec47.zip | |
gtest-1.6.0-r2: 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.
| -rw-r--r-- | dev-cpp/gtest/Manifest | 4 | ||||
| -rw-r--r-- | dev-cpp/gtest/gtest-1.6.0-r2.ebuild | 8 | ||||
| -rw-r--r-- | dev-cpp/gtest/metadata.xml | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest index fee21af..abeeed1 100644 --- a/dev-cpp/gtest/Manifest +++ b/dev-cpp/gtest/Manifest @@ -1,4 +1,4 @@ AUX configure-fix-pthread-linking.patch 3142 SHA256 501f42dd4f4f4412fcb18fc4eb5f1100f5c5a6b19610f6548bccc84989c6f83e SHA512 4347570606853c75e43d3d1abe449cd562538e531136658e6742f8e2dddcc1767932b427a063f711b868467ca85ff947f24c4ed3e328319bd0a739bb66093016 WHIRLPOOL 5ab7be10a9bd675398884f2a4ad8c30fef17412ff3fbaae5d14cf290ebf723ccc005d2ea1dd7ad68c8bd8db57d06cc0fadd79d7f9f2ab46ea5ed0a87df8201fb DIST gtest-1.6.0.zip 1121697 SHA256 5ec97df8e75b4ee796604e74716d1b50582beba22c5502edd055a7e67a3965d8 SHA512 f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115 WHIRLPOOL 745a49020d4353ed2fa38adfc80bbd777358c831719bbe3b7c90d243f84256615222ba5f04d48d98b9e1a803bb40766799b3aedd575024c19d853d9239a12f8a -EBUILD gtest-1.6.0-r2.ebuild 1484 SHA256 c87b022ee9816a1db01d912665fd9e9d7d6a3a604c85bd12c0169211adfc58e6 SHA512 f54d7c3a52874c7e93d60285023ff937b06f1732284d498eb2b3ad340a2d1c01d31dd490d8af98f809f67d0eb013458d0867900c759974eac3ac1a4d53179bef WHIRLPOOL 44659378b0fa21ac79e634bec082f05adc801916229e0c9278295a1432f474ff99ef093fa374b218c48d7f1122d9c7a22edf803f1102295554988ef57be7205c -MISC metadata.xml 374 SHA256 776842821130b79f552271fe642b3e455006874c6eae5d1b9323e46a1670310a SHA512 a1248ebd1cc76617b425db3d91d8e96894561acb2fcca70c8524f50fa2f933e024d0d4a4d61797a90b42c00a6cfdce8a68057e94a82ce63dfd156037359a60cf WHIRLPOOL 99afc26196452541537ad72d29362547d3154c5f3772d5fd6fb9484ba499ed4b3567873b8eac3c5f2fa7f812b0466f2f3e5c5f25b168e9a069eb4ad2845fa99a +EBUILD gtest-1.6.0-r2.ebuild 1616 SHA256 69c26c4730dd98e0006591345fb5780e841380530ee6f0f4b50935988e959689 SHA512 a2bba5b7d661f7871dd2b1dca2f3d0e7d20dd7ca8d1ca4b519ca4cc5db57d6cb6a13ac0338298ba87ecd96b9865430e0871f299faf91f76fb493a453044a5277 WHIRLPOOL d7881af4247ae1a2ab96ffcf8727ebc28a5c787ddb49390eba64f43f50d83336a85aec503ba70e9976fd9aea5539f4a0bdc2f1af56cd302f4f11e5e84091aac0 +MISC metadata.xml 433 SHA256 ed3e3ac4372e7a0f6f41d5a1a8a9c90c29b5b76dcfe7c7a8dbe8a5c4acf189dc SHA512 5e2632ca8591795ae07e345a3f2507a0c6457a5662400e8d00f71f0c467e58ace54bfda09f2f574aa1d9f78e077aa0bc5e4069338da786c21759537cf7c822b4 WHIRLPOOL 6e7ae6a89ad6bd6e7fe9e8ddf4dae2fcbdbf5b19e0b088e7c4839a41c0b950c2c946038e0eeac63b674083ebff436157d7c24e3dd66335227e4c5959ae12428c diff --git a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild index bf91bbb..ae1e10b 100644 --- a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild +++ b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild @@ -5,7 +5,7 @@ EAPI="5" PYTHON_DEPEND="2" -inherit eutils python autotools-multilib +inherit eutils flag-o-matic python autotools-multilib DESCRIPTION="Google C++ Testing Framework" HOMEPAGE="http://code.google.com/p/googletest/" @@ -14,7 +14,7 @@ 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" +IUSE="examples +tr1 static-libs" DEPEND="app-arch/unzip" RDEPEND="" @@ -28,6 +28,10 @@ AUTOTOOLS_AUTORECONF="1" pkg_setup() { python_pkg_setup python_set_active_version 2 + if ! use tr1; then + append-cflags -DGTEST_USE_OWN_TR1_TUPLE=1 + append-cxxflags -DGTEST_USE_OWN_TR1_TUPLE=1 + fi } src_prepare() { diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml index 0027097..0ff2b8f 100644 --- a/dev-cpp/gtest/metadata.xml +++ b/dev-cpp/gtest/metadata.xml @@ -9,4 +9,7 @@ <doc lang="en">http://code.google.com/p/googletest/w/list</doc> <remote-id type="google-code">googletest</remote-id> </upstream> + <use> + <flag name="tr1">Use TR1 libraries</flag> + </use> </pkgmetadata> |