[gentoo-commits] gentoo-x86 commit in eclass: php-common-r1.eclass

[Markus Ullmann (jokey)]

jokey       08/03/03 17:05:07

  Modified:             php-common-r1.eclass
  Log:
  Some cleanups from project overlay

Revision  Changes    Path
1.13                 eclass/php-common-r1.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?r1=1.12&r2=1.13

Index: php-common-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- php-common-r1.eclass	29 Nov 2007 23:11:04 -0000	1.12
+++ php-common-r1.eclass	3 Mar 2008 17:05:06 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.12 2007/11/29 23:11:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.13 2008/03/03 17:05:06 jokey Exp $
 
 # Based on robbat2's work on the php4 sapi eclass
 # Based on stuart's work on the php5 sapi eclass
@@ -20,18 +20,9 @@
 # ========================================================================
 
 php_check_cflags() {
-	# Filter the following from C[XX]FLAGS regardless, as apache won't be
-	# supporting LFS until 2.2 is released and in the tree. Fixes bug #24373.
-	filter-flags "-D_FILE_OFFSET_BITS=64"
-	filter-flags "-D_FILE_OFFSET_BITS=32"
-	filter-flags "-D_LARGEFILE_SOURCE=1"
-	filter-flags "-D_LARGEFILE_SOURCE"
-
 	# Fixes bug #14067.
 	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-flags "-march=k6-3" "-march=i586"
-	replace-flags "-march=k6-2" "-march=i586"
-	replace-flags "-march=k6" "-march=i586"
+	replace-cpu-flags "k6*" "i586"
 }
 
 # ========================================================================
@@ -58,6 +49,15 @@
 			die "Please recompile the IMAP C-Client libraries with SSL support disabled"
 		fi
 	fi
+
+	if use "kolab" || phpconfutils_usecheck "kolab" ; then
+		if ! built_with_use net-libs/c-client kolab ; then
+			eerror
+			eerror "IMAP with annotations support requested, but net-libs/c-client is built without it!"
+			eerror
+			die "Please recompile net-libs/c-client with USE=kolab."
+		fi
+	fi
 }
 
 # ========================================================================



-- 
gentoo-commits@l.g.o mailing list