diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-19 13:00:27 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-19 13:00:27 +0000 |
| commit | ce9d8ad85de5f4ce720f74157d3f3a9243826fd6 (patch) | |
| tree | f563524aa570b885f2a5c53582617cb28f9b243f /profiles/default | |
| parent | Removed old versions (diff) | |
| download | gentoo-2-ce9d8ad85de5f4ce720f74157d3f3a9243826fd6.tar.gz gentoo-2-ce9d8ad85de5f4ce720f74157d3f3a9243826fd6.tar.bz2 gentoo-2-ce9d8ad85de5f4ce720f74157d3f3a9243826fd6.zip | |
force curl[ssl,curl_ssl_openssl] and mask the others: curl is in @system for this profile so better have it with sane defaults.
Diffstat (limited to 'profiles/default')
3 files changed, 16 insertions, 3 deletions
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/ChangeLog b/profiles/default/bsd/fbsd/amd64/9.1/clang/ChangeLog index af0e5868d5c6..3b12985436b2 100644 --- a/profiles/default/bsd/fbsd/amd64/9.1/clang/ChangeLog +++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/ChangeLog,v 1.7 2013/06/19 00:04:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/ChangeLog,v 1.8 2013/06/19 13:00:27 aballier Exp $ + + 19 Jun 2013; Alexis Ballier <aballier@gentoo.org> package.use.force, + package.use.mask: + force curl[ssl,curl_ssl_openssl] and mask the others: curl is in @system for + this profile so better have it with sane defaults. 19 Jun 2013; Alexis Ballier <aballier@gentoo.org> -package.unmask: no need to unmask clang 3.3 now that it is unmasked globally diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force index a1386015ea51..79a0c2c3c2a4 100644 --- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force +++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force @@ -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/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force,v 1.3 2013/06/01 14:17:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force,v 1.4 2013/06/19 13:00:27 aballier Exp $ # Force building libc++ over libcxxrt. sys-libs/libcxx libcxxrt @@ -9,3 +9,7 @@ sys-libs/libcxx libcxxrt # work. sys-libs/libcxxrt static-libs sys-libs/libcxx static-libs + +# Force openssl on curl since cmakes needs it and is in @system because of +# libcxx on this profile. Mask the other ssl providers. +net-misc/curl ssl curl_ssl_openssl diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask index 479eb9255a10..171daabda2da 100644 --- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask +++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask @@ -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/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.3 2013/06/01 14:17:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.4 2013/06/19 13:00:27 aballier Exp $ # Build libcxxrt over libgcc_s since that is what clang defaults to. sys-libs/libcxxrt libunwind @@ -10,3 +10,7 @@ sys-libs/libcxxrt libunwind # https://bugs.gentoo.org/show_bug.cgi?id=427344 # http://llvm.org/bugs/show_bug.cgi?id=12299 sys-devel/binutils cxx + +# Force openssl on curl since cmakes needs it and is in @system because of +# libcxx on this profile. Mask the other ssl providers. +net-misc/curl curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl |