| 1 |
scarabeus 12/01/31 07:55:35 |
| 2 |
|
| 3 |
Modified: ChangeLog samba-3.6.3.ebuild |
| 4 |
Log: |
| 5 |
Fix the gcc check. Closes bug #392893. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.497 net-fs/samba/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.497&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.497&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?r1=1.496&r2=1.497 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v |
| 19 |
retrieving revision 1.496 |
| 20 |
retrieving revision 1.497 |
| 21 |
diff -u -r1.496 -r1.497 |
| 22 |
--- ChangeLog 30 Jan 2012 13:21:54 -0000 1.496 |
| 23 |
+++ ChangeLog 31 Jan 2012 07:55:35 -0000 1.497 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-fs/samba |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.496 2012/01/30 13:21:54 patrick Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.497 2012/01/31 07:55:35 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 31 Jan 2012; Tomáš Chvátal <scarabeus@g.o> samba-3.6.3.ebuild: |
| 31 |
+ Fix the gcc check. Closes bug #392893. |
| 32 |
|
| 33 |
*samba-3.5.12 (30 Jan 2012) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 net-fs/samba/samba-3.6.3.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: samba-3.6.3.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- samba-3.6.3.ebuild 30 Jan 2012 12:14:55 -0000 1.1 |
| 51 |
+++ samba-3.6.3.ebuild 31 Jan 2012 07:55:35 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild,v 1.1 2012/01/30 12:14:55 patrick Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild,v 1.2 2012/01/31 07:55:35 scarabeus Exp $ |
| 57 |
|
| 58 |
EAPI=4 |
| 59 |
|
| 60 |
@@ -71,6 +71,20 @@ |
| 61 |
swat? ( server ) |
| 62 |
" |
| 63 |
|
| 64 |
+pkg_pretend() { |
| 65 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
| 66 |
+ if use winbind && |
| 67 |
+ [[ $(tc-getCC)$ == *gcc* ]] && |
| 68 |
+ [[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] |
| 69 |
+ then |
| 70 |
+ eerror "It is a known issue that ${P} will not build with " |
| 71 |
+ eerror "winbind use flag enabled when using gcc < 4.3 ." |
| 72 |
+ eerror "Please use at least the latest stable gcc version." |
| 73 |
+ die "Using sys-devel/gcc < 4.3 with winbind use flag." |
| 74 |
+ fi |
| 75 |
+ fi |
| 76 |
+} |
| 77 |
+ |
| 78 |
pkg_setup() { |
| 79 |
if use server ; then |
| 80 |
SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd" |
| 81 |
@@ -98,16 +112,6 @@ |
| 82 |
use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" |
| 83 |
use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex" |
| 84 |
fi |
| 85 |
- |
| 86 |
- if use winbind && |
| 87 |
- [[ $(tc-getCC)$ == *gcc* ]] && |
| 88 |
- [[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] |
| 89 |
- then |
| 90 |
- eerror "It is a known issue that ${P} will not build with " |
| 91 |
- eerror "winbind use flag enabled when using gcc < 4.3 ." |
| 92 |
- eerror "Please use at least the latest stable gcc version." |
| 93 |
- die "Using sys-devel/gcc < 4.3 with winbind use flag." |
| 94 |
- fi |
| 95 |
} |
| 96 |
|
| 97 |
src_prepare() { |
Archives