diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-05-30 23:36:49 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-05-30 23:36:49 +0000 |
| commit | 470bd4530d29c07dc4691ddd4e0bc388ffded2ab (patch) | |
| tree | e7b81e76c586b32df3fb77d03a45a85becc03f13 /sys-libs | |
| parent | stop hacking around unwind headers and install them protected under libcxxrt ... (diff) | |
| download | historical-470bd4530d29c07dc4691ddd4e0bc388ffded2ab.tar.gz historical-470bd4530d29c07dc4691ddd4e0bc388ffded2ab.tar.bz2 historical-470bd4530d29c07dc4691ddd4e0bc388ffded2ab.zip | |
use upstream documented way for building on top of libcxxrt
Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/libcxx/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/libcxx/Manifest | 10 | ||||
| -rw-r--r-- | sys-libs/libcxx/libcxx-9999.ebuild | 16 |
3 files changed, 21 insertions, 10 deletions
diff --git a/sys-libs/libcxx/ChangeLog b/sys-libs/libcxx/ChangeLog index 3e4ada5b7bde..c3fc2d7eafa9 100644 --- a/sys-libs/libcxx/ChangeLog +++ b/sys-libs/libcxx/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/libcxx # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.14 2013/05/30 23:21:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.15 2013/05/30 23:36:35 aballier Exp $ + + 30 May 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild: + use upstream documented way for building on top of libcxxrt 30 May 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild: add a static-libs useflag and link tests with -lm diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index 7e0a4eb09730..9ba7619d0294 100644 --- a/sys-libs/libcxx/Manifest +++ b/sys-libs/libcxx/Manifest @@ -6,13 +6,13 @@ AUX multilib.patch 452 SHA256 16a64b3f0d81da0fc99dcb71cf5f7f75f7bb08c827cd329a12 AUX prepare_snapshot.sh 427 SHA256 9ebf22257a2e296dee41a56b0a721cd1ba459c620009ca8422ba812515ff726f SHA512 ebac2a467f8b1dfb68f1dc46a35f8294d1cf74b70be2a008217fa13b3366ddf4a9f2ebbe611cd63824f42305c5c0304aac2f46386b2956c9e07d82d5d984b435 WHIRLPOOL 232a60d6a22f50c424ec9cf6f325bbb4e8e96815ba9dffdad0a5b1b872b19d20126d316ced71956978eb5ce098f72584d21104c14e232330b3893a73e4c3c358 DIST libcxx-0.0_p20130218.tar.xz 795520 SHA256 18bb8e4670e97e4e270c153ae7ba5d9861e0b28088db447e124694aee89f800c SHA512 1d3a5a4615e9b2070f1d2f47b4738a59e35aa5ea99bba92761094e90fc8ac382fcb9c2181db201e88cdc5c3c15661ce67314494747e95aba6830d2d94769381e WHIRLPOOL eef2d8ebe21a2f52457f5cf9385df75b9c2f689bbc991e7f82d97b15f0b933ba2bc311f4c0d4ea396ce34e4e971f3480a77fa534f75cce0f19c3a9a7196e83bf EBUILD libcxx-0.0_p20130218.ebuild 1762 SHA256 73ec38dcc52bb2e35172dcb99ae667a976ade6a672b6c6e0e3e503460866b3ae SHA512 57abd59e833f5594b19505363e492efaef70872d0e8e31d8fca1667380f21fe67d266b6b7dab1a6b3aeb906039d93e51081da85b0c43e1f4e1c4f65b3d4d75f7 WHIRLPOOL 94de3f70ba4083e95b85a81d3518c5d0af5655547f389cc87ed917e424b22e671850191efaf3bafc997b8d24c569ec6b39b6d72886c9e75c570d86e451264de8 -EBUILD libcxx-9999.ebuild 2186 SHA256 6ef93ed862ce768267c4edee5715ba942e8fa4495fea339f03044f4635fe9045 SHA512 9cbf2988cd772c0925553aded84bb63b29a266ba33568330f3e492fc82e156d27f8f6436428e413a825e4b1b81e882bddd5d21645cd07dce2389e89dc384792c WHIRLPOOL f2c7ace00fb1dd177429ab2c1f428fdb1c063175835f867c71e733579d79e73f1d7201e4a4392cfa93072af77a87ea6bad076e1d569386c41edda4902b9672e4 -MISC ChangeLog 2164 SHA256 6d241cd4faa2df21aee3d7372ea129ed63638f77b6846aff4ee2399ef6862c87 SHA512 2b36e6b3031106856706ed1d07562f09a5f6fface6658f56c56f06928706041da7252d27f727b8f6a6365ded8bf7ddb551eb528a87473d6e7eae565511c9bdcb WHIRLPOOL 114167277c310114dc2988c10bc8b786ccb7d145ddf86527efc53d2702c841292734d3984c65b35e7bb2fd92a9532e0f44d67ea5f653617460d8edf2d0b78178 +EBUILD libcxx-9999.ebuild 2365 SHA256 9e8108187843da969f34f828243f8c6f8b28be4eb252a5259b90c0fa49ea77e9 SHA512 7a7f950f4bc58d86de48b9368e06ae2af16c2bdaf978f688c55b71393d45ad901fd30a614356ad317a5ee9405808dfefcf90bbbee8e7155377786bdfe14f966b WHIRLPOOL 12e9198b26c63b609fca52989061c83b239054ad4ef28ce169a41e9dbdd30cfbc6e2513275c63740d012b157f0bc8d61ab738abfe8482d8cf097ba8c4db54fa3 +MISC ChangeLog 2299 SHA256 db1b7fe41f7271d42f9dc1e7829f346f3da4fc9e80224596b5fead342b1d3927 SHA512 65c51d80e6e0f05707f0fa6a682cba5378e083bf4699d2a4c6d33665dda72a95964b068142b31b43ef0f3692ccffe1c0db0f2451b2314bcb600d965d7eb89eb7 WHIRLPOOL 70512b2ebbda95e8e1c16c758136085dd314a19aa9407be5d51e6b0d273c465a5c58868722953e37f402dbf1ab99a96077ac4be79161f1e6c574109c5d9e36d2 MISC metadata.xml 410 SHA256 48dc051fd892bac8c59d3e895dfe7d4935cc15cf461ff95a1b4791e43d529b8d SHA512 2c897f96980ceae69ca10f97993c28d2359a6fb316ac9ff2656af3b933182125ce5eff439f90b9f95d5bcc88bfc9806273266401854b6ecb1e742726dae455a3 WHIRLPOOL 92d8e3f6fd359c1fd25c8a533c5ab4065f22844e8f911ba0545e983b51adf18e39d1a34d633f8b3d001bdfb4c93791a2d3a59fb5e3a355008f79df0216a3d4f6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlGn3wkACgkQvFcC4BYPU0quiQCcDarJmlzz2NClVfy6eaB7tQ42 -gskAn3BrES1thrldVkp8hjae00NN22a4 -=9B6T +iEYEAREIAAYFAlGn4oUACgkQvFcC4BYPU0q4VgCfdZx+DzA37A2RFK6A8zDuMcDY ++gMAn3nXwh7wfGqfPu2ylYoXnhsyp0pV +=D0Xm -----END PGP SIGNATURE----- diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild index 95db05dda4fb..3fc9275fd968 100644 --- a/sys-libs/libcxx/libcxx-9999.ebuild +++ b/sys-libs/libcxx/libcxx-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.7 2013/05/30 23:21:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.8 2013/05/30 23:36:35 aballier Exp $ EAPI=5 @@ -27,7 +27,7 @@ else fi IUSE="static-libs" -RDEPEND="sys-libs/libcxxrt[static-libs?]" +RDEPEND=">=sys-libs/libcxxrt-0.0_p20130530[static-libs?]" DEPEND="${RDEPEND} sys-devel/clang app-arch/xz-utils" @@ -41,12 +41,20 @@ src_prepare() { } src_configure() { - append-cppflags "-I/usr/include/libcxxrt -DLIBCXXRT" # Needs to be built with clang. gcc-4.6.3 fails at least. # TODO: cross-compile ? export CC=clang export CXX=clang++ - use static-libs && BUILD_DIR="${S}_static" mycmakeargs="-DLIBCXX_ENABLE_SHARED=OFF" cmake-utils_src_configure + + local mycmakeargs_base=( + -DLIBCXX_CXX_ABI=libcxxrt + -DLIBCXX_LIBCXXRT_INCLUDE_PATHS="/usr/include/libcxxrt/" + ) + if use static-libs ; then + local mycmakeargs=( "${mycmakeargs_base[@]}" "-DLIBCXX_ENABLE_SHARED=OFF" ) + BUILD_DIR="${S}_static" cmake-utils_src_configure + fi + local mycmakeargs=( "${mycmakeargs_base[@]}" ) BUILD_DIR="${S}_shared" cmake-utils_src_configure } |