diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-05-30 23:21:57 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-05-30 23:21:57 +0000 |
| commit | ad01532e9bb0b612c7983184366ba579486dd462 (patch) | |
| tree | 63790b30d363ee3487de8131aa16664a7bffb4d4 | |
| parent | Fix build with new automake/aclocal. Also bug #343341: _FORTIFY_SOURCE. (diff) | |
| download | historical-ad01532e9bb0b612c7983184366ba579486dd462.tar.gz historical-ad01532e9bb0b612c7983184366ba579486dd462.tar.bz2 historical-ad01532e9bb0b612c7983184366ba579486dd462.zip | |
add a static-libs useflag and link tests with -lm
Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
| -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 | 24 |
3 files changed, 27 insertions, 12 deletions
diff --git a/sys-libs/libcxx/ChangeLog b/sys-libs/libcxx/ChangeLog index 40f0e694f949..3e4ada5b7bde 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.13 2013/05/30 21:51:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.14 2013/05/30 23:21:43 aballier Exp $ + + 30 May 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild: + add a static-libs useflag and link tests with -lm 30 May 2013; Alexis Ballier <aballier@gentoo.org> -libcxx-0.0_p20121105.ebuild: diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index afe9ef781c79..7e0a4eb09730 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 1753 SHA256 5da83431d5b910f0a5eaddbbd204b7e10ace643859d90cad4ee4785aa1ca34d4 SHA512 db422bdada94c573aa2350a11fdf7df328b42ff1ff5d1092e4dda349d217cfad714cd3e72aeca1ea8ec28064227b5d71369883c2faa9e7ccdff3a87af3747df0 WHIRLPOOL 238d6112ca7ffb74967b1108141ade45c755ba374d2a34aafa41bc5791c259b0a01b0d8bc30a2de8a2af52e721c7419f7f043f2f600efbd36bb9b431d2fdc959 -MISC ChangeLog 2039 SHA256 2db27c2a302d4b094e7f2545bfaae939b136b7d806286c2809f0a87258465e24 SHA512 1500b1416f3f99b85ce18fe96a6fb169dc758b1fab6a91e7950d6bfcd7a08d5c509e06b6ae5eebc1f0381ab5f19bbc3857164802bd4e5e2dcb47508f9cf5ad15 WHIRLPOOL a5f234dfb4b4ea52ab17a6a9306960fb61d96b527b854b69c063800c3f7d667ad2a2199d40f2fcf099d40753a6d913da7f4f39e442fddcd7b1f8b2c2e1ca62fa +EBUILD libcxx-9999.ebuild 2186 SHA256 6ef93ed862ce768267c4edee5715ba942e8fa4495fea339f03044f4635fe9045 SHA512 9cbf2988cd772c0925553aded84bb63b29a266ba33568330f3e492fc82e156d27f8f6436428e413a825e4b1b81e882bddd5d21645cd07dce2389e89dc384792c WHIRLPOOL f2c7ace00fb1dd177429ab2c1f428fdb1c063175835f867c71e733579d79e73f1d7201e4a4392cfa93072af77a87ea6bad076e1d569386c41edda4902b9672e4 +MISC ChangeLog 2164 SHA256 6d241cd4faa2df21aee3d7372ea129ed63638f77b6846aff4ee2399ef6862c87 SHA512 2b36e6b3031106856706ed1d07562f09a5f6fface6658f56c56f06928706041da7252d27f727b8f6a6365ded8bf7ddb551eb528a87473d6e7eae565511c9bdcb WHIRLPOOL 114167277c310114dc2988c10bc8b786ccb7d145ddf86527efc53d2702c841292734d3984c65b35e7bb2fd92a9532e0f44d67ea5f653617460d8edf2d0b78178 MISC metadata.xml 410 SHA256 48dc051fd892bac8c59d3e895dfe7d4935cc15cf461ff95a1b4791e43d529b8d SHA512 2c897f96980ceae69ca10f97993c28d2359a6fb316ac9ff2656af3b933182125ce5eff439f90b9f95d5bcc88bfc9806273266401854b6ecb1e742726dae455a3 WHIRLPOOL 92d8e3f6fd359c1fd25c8a533c5ab4065f22844e8f911ba0545e983b51adf18e39d1a34d633f8b3d001bdfb4c93791a2d3a59fb5e3a355008f79df0216a3d4f6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlGnye4ACgkQvFcC4BYPU0oQaACfTreBqfOUhCUOGdpTLOz41ksQ -3ZUAn0s6g3VcfwW4j5GneaLX/Eki3/xh -=joSP +iEYEAREIAAYFAlGn3wkACgkQvFcC4BYPU0quiQCcDarJmlzz2NClVfy6eaB7tQ42 +gskAn3BrES1thrldVkp8hjae00NN22a4 +=9B6T -----END PGP SIGNATURE----- diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild index ff51b70bf31a..95db05dda4fb 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.6 2013/05/30 21:48:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.7 2013/05/30 23:21:43 aballier Exp $ EAPI=5 @@ -25,9 +25,9 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="" +IUSE="static-libs" -RDEPEND="sys-libs/libcxxrt" +RDEPEND="sys-libs/libcxxrt[static-libs?]" DEPEND="${RDEPEND} sys-devel/clang app-arch/xz-utils" @@ -46,19 +46,31 @@ src_configure() { # TODO: cross-compile ? export CC=clang export CXX=clang++ - cmake-utils_src_configure + use static-libs && BUILD_DIR="${S}_static" mycmakeargs="-DLIBCXX_ENABLE_SHARED=OFF" cmake-utils_src_configure + BUILD_DIR="${S}_shared" cmake-utils_src_configure +} + +src_compile() { + use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_compile + BUILD_DIR="${S}_shared" cmake-utils_src_compile } # Tests fail for now, if anybody is able to fix them, help is very welcome. src_test() { cd "${S}/test" - LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \ + LD_LIBRARY_PATH="${S}_shared/lib:${LD_LIBRARY_PATH}" \ CC="clang++" \ HEADER_INCLUDE="-I${S}/include" \ - SOURCE_LIB="-L${CMAKE_BUILD_DIR}/lib" \ + SOURCE_LIB="-L${S}_shared/lib" \ + LIBS="-lm" \ ./testit || die } +src_install() { + use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_install + BUILD_DIR="${S}_shared" cmake-utils_src_install +} + pkg_postinst() { elog "This package (${PN}) is mainly intended as a replacement for the C++" elog "standard library when using clang." |