Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 372326 Details for
Bug 493166
net-libs/gnutls: please add abi_x86_32 support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gnutls-3.2.12.1.ebuild.patch
gnutls-3.2.12.1.ebuild.patch (text/plain), 3.48 KB, created by
Michael Mair-Keimberger (iamnr3)
on 2014-03-10 21:03:08 UTC
(
hide
)
Description:
gnutls-3.2.12.1.ebuild.patch
Filename:
MIME Type:
Creator:
Michael Mair-Keimberger (iamnr3)
Created:
2014-03-10 21:03:08 UTC
Size:
3.48 KB
patch
obsolete
>--- /usr/portage/net-libs/gnutls/gnutls-3.2.12.1.ebuild 2014-03-05 20:42:46.000000000 +0100 >+++ gnutls-3.2.12.1.ebuild 2014-03-10 21:03:10.000000000 +0100 >@@ -1,10 +1,10 @@ > # Copyright 1999-2014 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.12.1.ebuild,v 1.1 2014/03/05 19:42:46 radhermit Exp $ >+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.12.ebuild,v 1.1 2014/03/03 20:09:58 radhermit Exp $ > > EAPI=5 > >-inherit autotools libtool eutils versionator >+inherit autotools-multilib libtool eutils versionator > > DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" > HOMEPAGE="http://www.gnutls.org/" >@@ -21,16 +21,20 @@ > > # NOTICE: sys-devel/autogen is required at runtime as we > # use system libopts >-RDEPEND=">=dev-libs/libtasn1-2.14 >- >=dev-libs/nettle-2.7[gmp] >- dev-libs/gmp >- sys-devel/autogen >+RDEPEND=">=dev-libs/libtasn1-3.2[${MULTILIB_USEDEP}] >+ >=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}] >+ dev-libs/gmp[${MULTILIB_USEDEP}] >+ sys-devel/autogen[${MULTILIB_USEDEP}] > crywrap? ( net-dns/libidn ) >- dane? ( net-dns/unbound ) >+ dane? ( net-dns/unbound[${MULTILIB_USEDEP}] ) > guile? ( >=dev-scheme/guile-1.8[networking] ) >- nls? ( virtual/libintl ) >- pkcs11? ( >=app-crypt/p11-kit-0.19.2 ) >- zlib? ( >=sys-libs/zlib-1.2.3.1 )" >+ nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) >+ pkcs11? ( >=app-crypt/p11-kit-0.11[${MULTILIB_USEDEP}] ) >+ zlib? ( >=sys-libs/zlib-1.2.3.1[${MULTILIB_USEDEP}] ) >+ abi_x86_32? ( >+ !<=app-emulation/emul-linux-x86-baselibs-20131008-r9 >+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] >+ )" > DEPEND="${RDEPEND} > >=sys-devel/automake-1.11.6 > virtual/pkgconfig >@@ -38,10 +42,18 @@ > nls? ( sys-devel/gettext ) > test? ( app-misc/datefudge )" > >-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO ) >- > S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) > >+use_enable_binaries() { >+ if multilib_build_binaries; then >+ use_enable "$@" >+ else >+ local flag="$1" >+ local name="${2:-${flag}}" >+ echo "--disable-${name}" >+ fi >+} >+ > src_prepare() { > # tests/suite directory is not distributed > sed -i \ >@@ -69,24 +81,26 @@ > > # bug 497472 > use cxx || epunt_cxx >+ >+ multilib_copy_sources > } > >-src_configure() { >+multilib_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 \ >+ ECONF_SOURCE="${S}" econf \ > --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ > --disable-valgrind-tests \ > --enable-heartbeat-support \ > $(use_enable cxx) \ > $(use_enable dane libdane) \ >- $(use_enable doc gtk-doc) \ >- $(use_enable doc gtk-doc-pdf) \ >- $(use_enable guile) \ >+ $(use_enable_binaries doc gtk-doc) \ >+ $(use_enable_binaries doc gtk-doc-pdf) \ >+ $(use_enable_binaries guile guile) \ > $(use_enable crywrap) \ > $(use_enable nls) \ > $(use_enable static-libs static) \ >@@ -96,17 +110,15 @@ > $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration) > } > >-src_test() { >+multilib_src_test() { > # parallel testing often fails > emake -j1 check > } > >-src_install() { >- default >- >- find "${ED}" -name '*.la' -delete >+multilib_src_install_all() { >+ prune_libtool_files > >- dodoc doc/certtool.cfg >+ dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO doc/certtool.cfg > > if use doc; then > dodoc doc/gnutls.pdf
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 493166
:
365116
|
368810
|
369002
|
370260
|
370522
|
371580
|
372040
|
372326
|
372636
|
376320