summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-12-21 12:30:42 +0000
committerFabian Groffen <grobian@gentoo.org>2013-12-21 12:30:42 +0000
commita0c584f98dafffd573e7925f8b26c34beba1fbcd (patch)
treee07b56e2ca8bd0a9149f04a6b8b562df70b7b8a8 /net-libs
parentReorder by phase and group functions together with the phase that uses them. (diff)
downloadgentoo-2-a0c584f98dafffd573e7925f8b26c34beba1fbcd.tar.gz
gentoo-2-a0c584f98dafffd573e7925f8b26c34beba1fbcd.tar.bz2
gentoo-2-a0c584f98dafffd573e7925f8b26c34beba1fbcd.zip
Disable hardware accelleration on Darwin because that causes misc compilation problems for now
(Portage version: 2.2.7-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/gnutls/ChangeLog6
-rw-r--r--net-libs/gnutls/gnutls-3.2.8.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 184ca84884f1..d4ca0d9512ee 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/gnutls
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.457 2013/12/21 09:14:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.458 2013/12/21 12:30:42 grobian Exp $
+
+ 21 Dec 2013; Fabian Groffen <grobian@gentoo.org> gnutls-3.2.8.ebuild:
+ Disable hardware accelleration on Darwin because that causes misc compilation
+ problems for now
*gnutls-3.2.8 (21 Dec 2013)
diff --git a/net-libs/gnutls/gnutls-3.2.8.ebuild b/net-libs/gnutls/gnutls-3.2.8.ebuild
index 43f9215c62ec..9337567b3460 100644
--- a/net-libs/gnutls/gnutls-3.2.8.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.8.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/net-libs/gnutls/gnutls-3.2.8.ebuild,v 1.1 2013/12/21 09:14:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.8.ebuild,v 1.2 2013/12/21 12:30:42 grobian Exp $
EAPI=5
@@ -72,6 +72,9 @@ src_configure() {
LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
# TPM needs to be tested before being enabled
+ # hardware-accell is disabled on OSX because the asm files force
+ # GNU-stack (as doesn't support that) and when that's removed ld
+ # complains about duplicate symbols
econf \
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--disable-valgrind-tests \
@@ -85,7 +88,8 @@ src_configure() {
$(use_enable static-libs static) \
$(use_with pkcs11 p11-kit) \
$(use_with zlib) \
- --without-tpm
+ --without-tpm \
+ $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
}
src_test() {