diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-01-31 07:55:35 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-01-31 07:55:35 +0000 |
| commit | 3c1c45cfba56c6657ce8b9d9e5ad7b8383ceed5a (patch) | |
| tree | 2716285f51ef7cad32d6787a7e588439950ac73b /net-fs/samba | |
| parent | Revert previous commit, because cdrom.eclass sets PROPERTIES=interactive. (diff) | |
| download | gentoo-2-3c1c45cfba56c6657ce8b9d9e5ad7b8383ceed5a.tar.gz gentoo-2-3c1c45cfba56c6657ce8b9d9e5ad7b8383ceed5a.tar.bz2 gentoo-2-3c1c45cfba56c6657ce8b9d9e5ad7b8383ceed5a.zip | |
Fix the gcc check. Closes bug #392893.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'net-fs/samba')
| -rw-r--r-- | net-fs/samba/ChangeLog | 5 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.6.3.ebuild | 26 |
2 files changed, 19 insertions, 12 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 6300cc416ff4..32653bd93a1c 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-fs/samba # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.496 2012/01/30 13:21:54 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.497 2012/01/31 07:55:35 scarabeus Exp $ + + 31 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> samba-3.6.3.ebuild: + Fix the gcc check. Closes bug #392893. *samba-3.5.12 (30 Jan 2012) diff --git a/net-fs/samba/samba-3.6.3.ebuild b/net-fs/samba/samba-3.6.3.ebuild index 977107b1c569..17fa5ada3248 100644 --- a/net-fs/samba/samba-3.6.3.ebuild +++ b/net-fs/samba/samba-3.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild,v 1.1 2012/01/30 12:14:55 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild,v 1.2 2012/01/31 07:55:35 scarabeus Exp $ EAPI=4 @@ -71,6 +71,20 @@ REQUIRED_USE=" swat? ( server ) " +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if use winbind && + [[ $(tc-getCC)$ == *gcc* ]] && + [[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] + then + eerror "It is a known issue that ${P} will not build with " + eerror "winbind use flag enabled when using gcc < 4.3 ." + eerror "Please use at least the latest stable gcc version." + die "Using sys-devel/gcc < 4.3 with winbind use flag." + fi + fi +} + pkg_setup() { if use server ; then SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd" @@ -98,16 +112,6 @@ pkg_setup() { use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex" fi - - if use winbind && - [[ $(tc-getCC)$ == *gcc* ]] && - [[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] - then - eerror "It is a known issue that ${P} will not build with " - eerror "winbind use flag enabled when using gcc < 4.3 ." - eerror "Please use at least the latest stable gcc version." - die "Using sys-devel/gcc < 4.3 with winbind use flag." - fi } src_prepare() { |