diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-01 14:15:48 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-01 14:15:48 +0000 |
| commit | 6d773c85bd3d005ea5f544976d2f9cd28b36bdf9 (patch) | |
| tree | b293e4117b16995ff2ae4baeb658ef18a40c43dc /sys-libs | |
| parent | Version bump. (diff) | |
| download | historical-6d773c85bd3d005ea5f544976d2f9cd28b36bdf9.tar.gz historical-6d773c85bd3d005ea5f544976d2f9cd28b36bdf9.tar.bz2 historical-6d773c85bd3d005ea5f544976d2f9cd28b36bdf9.zip | |
Make libunwind optional in the current snapshot too
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/libcxxrt/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/libcxxrt/Manifest | 10 | ||||
| -rw-r--r-- | sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild | 13 |
3 files changed, 16 insertions, 13 deletions
diff --git a/sys-libs/libcxxrt/ChangeLog b/sys-libs/libcxxrt/ChangeLog index 8d17a0d5215a..fd81a1faf4f7 100644 --- a/sys-libs/libcxxrt/ChangeLog +++ b/sys-libs/libcxxrt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/libcxxrt # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.12 2013/06/01 12:58:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.13 2013/06/01 14:15:35 aballier Exp $ + + 01 Jun 2013; Alexis Ballier <aballier@gentoo.org> + libcxxrt-0.0_p20130531.ebuild: + Make libunwind optional in the current snapshot too 01 Jun 2013; Alexis Ballier <aballier@gentoo.org> libcxxrt-9999.ebuild, metadata.xml: diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest index da6acc71fbc8..7d9016e442ad 100644 --- a/sys-libs/libcxxrt/Manifest +++ b/sys-libs/libcxxrt/Manifest @@ -8,14 +8,14 @@ AUX unwind.h 3211 SHA256 fb24810e46a48727b91930c7e2267c521a478c90c9dcacb8c8c0d4e DIST libcxxrt-0.0_p20130218.tar.xz 57444 SHA256 27e4c7dcec3603631fb2ff8d0bf8f1c6dfc32d1c5f460512b630578b90255f77 SHA512 982d7840ecfb31b98ca8b71329bda8ce42396ae19fcd63a2f0fefb78e2a028f31207af0be2c7fbb26cf3f46c040dacdf27bc55bd1a05c7a240db9cee17f2f03a WHIRLPOOL a3eb3a0b5ec672c01d8a06aceceebefa221c20459f9c48f199f0bd0bdff3cdbab1e672673c80e9ca67d4ad757cfd2c6a300d1bc80193c0016eddcdc946e9766f DIST libcxxrt-0.0_p20130531.tar.xz 57452 SHA256 7e3bb7b3a5b9695b607e520b561e494c3b946f8949e57f4bc151c56056003cde SHA512 d262a9bd6db60667e1b613bbe794b0d12b86bb641f192848e38654125850b05330e2eec0b020c92e7b6a8f45fe829c53e60ceb7e125214491418fc9edcdce2c1 WHIRLPOOL ab32fb4725da712568361c936e0bad1d43014eac80e2224c904a821d6ff66c3e6a4d2c350c704d69d31f7a50f6f1eae7f7ad7d9621b68ff7c823ffe0d36fdfc7 EBUILD libcxxrt-0.0_p20130218.ebuild 1896 SHA256 451195f7a967977d5b55ee137e4a4be1dfa8c9317d50896c6986fd2a929853ad SHA512 50872547d64bc72a218ba6f8f4ab3c2010630cd3e0db0db47247704e891db85cc1dd6b9c91298691a269724954d999dd6279042e1487c73b5b086882a0da6246 WHIRLPOOL e5570749aa66389b6c40376aced751061b2f3ea2e5d6f1c8f24c10e4798dd8ab6d821bfcc4661626aa8b6f379edd6f94365caf02ca5876e4b7da59319ea93ebf -EBUILD libcxxrt-0.0_p20130531.ebuild 1856 SHA256 4a9bb0eddb2995085db271283c4e1749d5a05cee947e03c67a333447bd65723c SHA512 8e80d815ab5c8f9bf504cd1c7d7894bd3b3ab97319940d725f44106abcdbaed277871d4c3be219bef0cacfef8cae52bd8daab2a514141439ec42c07f0b09ea25 WHIRLPOOL e400fe84a5992e1cfe1199b279c442f2bc756f3db9795b0d6652cc5ed6a553ca3fa1eb478bc5146e02610263a5ca911d4fbf5113d2f6df7cb81ae098614a321e +EBUILD libcxxrt-0.0_p20130531.ebuild 1872 SHA256 754bd4f51188d14ce47e0be750ec2e37971e60dbb0872e931eb43b57108ed8e1 SHA512 facc00a9c6322dc4b773ce0cd0730d7695239112bed19424782767ca99f90f40adc0f801f272c472855268a331c080a2e89358106740bb1c74ab9bb3cd769bed WHIRLPOOL b8001993da61e7251f4a9d56ff5ccf6779ea2df6bc764d39949c7b895f47523b485d534145a5da2152b8baa7923cf649a5f6af577ee1dd4b9c7375586f578a72 EBUILD libcxxrt-9999.ebuild 1863 SHA256 3db4dcd1bffcb0906dfa5aa1e19744b2070a77b028787aa60d7fbac9e02c9dee SHA512 39982a9c9837618dd475c5d3c2b797f52e331faa3bab361a520360728e85514cf650a4070402df84ebfe8ada22edff6a9541b2cad3d1280b68d411e969b4493a WHIRLPOOL 17e26b6aebc796f6f1cee91f02dc999f53067e684182ce2b229857e28b0b171a4575f0da0b68155953bf392e0db7f92009448f9e72c296027d8811c21308e6e0 -MISC ChangeLog 2649 SHA256 1589805974652500cff26d2cde6cdbf27951f3c5ff542ec648a3c7312dc81c27 SHA512 53e20c202266221759924727c6cb3784b849196eb905d574966c75a0a52026d3d5a4d819ef2c98df616c627fbd83c945de06621020f08320692064f7b45eae42 WHIRLPOOL 22965d16caf674b12ee3b402a4cf6730238c249cdbfb4f8803cc208636db287b8f6f31d52cb57e45d4720443052b0a82b75601c9c6484b286d16c893d71abbe6 +MISC ChangeLog 2789 SHA256 3d99945f3797400ab6951642d2ee5f0a53bb17e47fff51ab6efe8863b1057e08 SHA512 218cc77224bb00a502d825910b6ff1e09c36244a03e77cffb56236d7d10ba3b0436176f024d98f0056d97a3d82a72a7640d14a3128a1b3a7b4580ce311d77137 WHIRLPOOL 0e613dce01630452f4a47c9847139ed877d21cc6963db921e500c3a083f64741142ddcf66d1f6e53b78dd272aaeef1fe596d7bb749cd5f82802c5212d914dfe9 MISC metadata.xml 487 SHA256 8555868cad0dd1e415efdfc947d5ad9ccfea5e68d64d8467487480c15bb594ed SHA512 a377efd893dd484c6d99509d0f5c72a81e0ca3f10078e73110cae45acf8142921265d53f540db854ce1d72b558b380dd645b8f7802aac72f9f761ad0d2767e24 WHIRLPOOL d30b16450bbbe1d7fd4120ebe04e461b89d3575e0ac4a3b1e0956c64172a1bcf0bf6637f58f899f4d6c6ad557bffdccec7c9993202ddf79425f5634882c9891f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlGp8AIACgkQvFcC4BYPU0o2lwCgs1Osew8zj3twm5OJw1XUDLf7 -rCoAnieLAPFwk92rt5lOsjXloRkcmIAb -=TRXq +iEYEAREIAAYFAlGqAggACgkQvFcC4BYPU0oOgQCffP4Z2Ph41cFl+cZ3b3UZF94U +Ck8AoJ0rArTSjq9+Aw5iCbTxPNL7a5v/ +=EFXP -----END PGP SIGNATURE----- diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild index 2ecb1fa9e35b..5616c8c0be76 100644 --- a/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild +++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild,v 1.1 2013/05/31 15:54:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20130531.ebuild,v 1.2 2013/06/01 14:15:35 aballier Exp $ -EAPI=4 +EAPI=5 EGIT_REPO_URI="git://github.com/pathscale/libcxxrt.git" @@ -26,9 +26,9 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="static-libs" +IUSE="libunwind static-libs" -RDEPEND=">=sys-libs/libunwind-1.0.1-r1[static-libs?]" +RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )" DEPEND="${RDEPEND} ${DEPEND}" @@ -40,12 +40,11 @@ src_prepare() { src_compile() { # Notes: we build -nodefaultlibs to avoid linking to gcc libs. - # libcxxrt needs: dladdr (dlopen_lib), libunwind (or libgcc_s but we build - # over libunwind) and the libc. + # libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc. tc-export CC CXX AR append-ldflags "-Wl,-z,defs" # make sure we are not underlinked cd "${S}/src" - LIBS="$(dlopen_lib) -lunwind -lc" emake shared + LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared use static-libs && emake static } |