* [gentoo-commits] gentoo-x86 commit in eclass: php-common-r1.eclass
@ 2007-11-29 23:11 Markus Ullmann (jokey)
0 siblings, 0 replies; 5+ messages in thread
From: Markus Ullmann (jokey) @ 2007-11-29 23:11 UTC (permalink / raw
To: gentoo-commits
jokey 07/11/29 23:11:05
Modified: php-common-r1.eclass
Log:
Don't use backticks
Revision Changes Path
1.12 eclass/php-common-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?r1=1.11&r2=1.12
Index: php-common-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-common-r1.eclass 1 Sep 2007 15:58:17 -0000 1.11
+++ php-common-r1.eclass 29 Nov 2007 23:11:04 -0000 1.12
@@ -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.11 2007/09/01 15:58:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.12 2007/11/29 23:11:04 jokey Exp $
# Based on robbat2's work on the php4 sapi eclass
# Based on stuart's work on the php5 sapi eclass
@@ -72,7 +72,7 @@
return
fi
- JDKHOME="`java-config --jdk-home`"
+ JDKHOME="$(java-config --jdk-home)"
NOJDKERROR="You need to use the 'java-config' utility to set your JVM to a JDK!"
if [[ -z "${JDKHOME}" ]] || [[ ! -d "${JDKHOME}" ]] ; then
eerror "${NOJDKERROR}"
@@ -132,7 +132,7 @@
return
fi
- JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's,.\+-DJAVALIB=\"\([^"]*\)\".*$,\1,g;' | sort -u`"
+ JAVA_LIBRARY="$(grep -- '-DJAVALIB' Makefile | sed -e 's,.\+-DJAVALIB=\"\([^"]*\)\".*$,\1,g;' | sort -u)"
echo "extension = java.so" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
echo "java.library = ${JAVA_LIBRARY}" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-common-r1.eclass
@ 2008-03-03 17:05 Markus Ullmann (jokey)
0 siblings, 0 replies; 5+ messages in thread
From: Markus Ullmann (jokey) @ 2008-03-03 17:05 UTC (permalink / raw
To: gentoo-commits
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@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-common-r1.eclass
@ 2008-05-27 10:14 Christian Hoffmann (hoffie)
0 siblings, 0 replies; 5+ messages in thread
From: Christian Hoffmann (hoffie) @ 2008-05-27 10:14 UTC (permalink / raw
To: gentoo-commits
hoffie 08/05/27 10:14:35
Modified: php-common-r1.eclass
Log:
trying to fix postgresql check logic in php-common-r1.eclass, bug 223797
Revision Changes Path
1.15 eclass/php-common-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?r1=1.14&r2=1.15
Index: php-common-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- php-common-r1.eclass 25 May 2008 09:27:48 -0000 1.14
+++ php-common-r1.eclass 27 May 2008 10:14:34 -0000 1.15
@@ -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.14 2008/05/25 09:27:48 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.15 2008/05/27 10:14:34 hoffie Exp $
# Based on robbat2's work on the php4 sapi eclass
# Based on stuart's work on the php5 sapi eclass
@@ -209,23 +209,24 @@
# ========================================================================
php_check_pgsql() {
- if use "postgres" \
- && use "apache2" && use "threads" ; then
- if has_version ">=dev-db/libpq-8.1.3-r1" \
- && ! built_with_use ">=dev-db/libpq-8.1.3-r1" "threads" ; then
- eerror
- eerror "You must build dev-db/libpq with USE=threads"
- eerror "if you want to build PHP with threads support!"
- eerror
- die "Rebuild dev-db/libpq with USE=threads"
- fi
- local pgsql_ver=$(eselect postgresql show)
- if ! built_with_use "=dev-db/postgresql-base-${pgsql_ver}*" threads ; then
- eerror
- eerror "You must build =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
- eerror "if you want to build PHP with threads support!"
- eerror
- die "Rebuild =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
+ if use "postgres" && use "apache2" && use "threads" ; then
+ if has_version ">=dev-db/libpq-8.1.3-r1" ; then
+ if ! built_with_use ">=dev-db/libpq-8.1.3-r1" "threads" ; then
+ eerror
+ eerror "You must build dev-db/libpq with USE=threads"
+ eerror "if you want to build PHP with threads support!"
+ eerror
+ die "Rebuild dev-db/libpq with USE=threads"
+ fi
+ else
+ local pgsql_ver=$(eselect postgresql show)
+ if ! built_with_use "=dev-db/postgresql-base-${pgsql_ver}*" threads ; then
+ eerror
+ eerror "You must build =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
+ eerror "if you want to build PHP with threads support!"
+ eerror
+ die "Rebuild =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
+ fi
fi
fi
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-common-r1.eclass
@ 2008-05-29 14:45 Christian Hoffmann (hoffie)
0 siblings, 0 replies; 5+ messages in thread
From: Christian Hoffmann (hoffie) @ 2008-05-29 14:45 UTC (permalink / raw
To: gentoo-commits
hoffie 08/05/29 14:45:38
Modified: php-common-r1.eclass
Log:
hopefully last shot at fixing php-common-r1.eclass for postgresql usage, thanks to zlin and dev-zero (again ;)), bug 223797, bug 222933
Revision Changes Path
1.16 eclass/php-common-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?r1=1.15&r2=1.16
Index: php-common-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- php-common-r1.eclass 27 May 2008 10:14:34 -0000 1.15
+++ php-common-r1.eclass 29 May 2008 14:45:38 -0000 1.16
@@ -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.15 2008/05/27 10:14:34 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.16 2008/05/29 14:45:38 hoffie Exp $
# Based on robbat2's work on the php4 sapi eclass
# Based on stuart's work on the php5 sapi eclass
@@ -210,8 +210,9 @@
php_check_pgsql() {
if use "postgres" && use "apache2" && use "threads" ; then
- if has_version ">=dev-db/libpq-8.1.3-r1" ; then
- if ! built_with_use ">=dev-db/libpq-8.1.3-r1" "threads" ; then
+ if has_version dev-db/libpq ; then
+ if has_version ">=dev-db/libpq-8" && \
+ ! built_with_use ">=dev-db/libpq-8" "threads" ; then
eerror
eerror "You must build dev-db/libpq with USE=threads"
eerror "if you want to build PHP with threads support!"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-common-r1.eclass
@ 2010-01-22 13:23 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-01-22 13:23 UTC (permalink / raw
To: gentoo-commits
scarabeus 10/01/22 13:23:44
Modified: php-common-r1.eclass
Log:
Die out if eselect postgresql does not contain valid profile.
Revision Changes Path
1.17 eclass/php-common-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?r1=1.16&r2=1.17
Index: php-common-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- php-common-r1.eclass 29 May 2008 14:45:38 -0000 1.16
+++ php-common-r1.eclass 22 Jan 2010 13:23:44 -0000 1.17
@@ -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.16 2008/05/29 14:45:38 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.17 2010/01/22 13:23:44 scarabeus Exp $
# Based on robbat2's work on the php4 sapi eclass
# Based on stuart's work on the php5 sapi eclass
@@ -221,6 +221,10 @@
fi
else
local pgsql_ver=$(eselect postgresql show)
+ if [[ ${pgsql_ver} == "(none)" ]]; then
+ eerror "QA: Please select your PostgreSQL version \"eselect postgresql list\""
+ die "Can't determine PgSQL."
+ fi
if ! built_with_use "=dev-db/postgresql-base-${pgsql_ver}*" threads ; then
eerror
eerror "You must build =dev-db/postgresql-base-${pgsql_ver} with USE=threads"
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-01-22 13:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-29 14:45 [gentoo-commits] gentoo-x86 commit in eclass: php-common-r1.eclass Christian Hoffmann (hoffie)
-- strict thread matches above, loose matches on Subject: below --
2010-01-22 13:23 Tomas Chvatal (scarabeus)
2008-05-27 10:14 Christian Hoffmann (hoffie)
2008-03-03 17:05 Markus Ullmann (jokey)
2007-11-29 23:11 Markus Ullmann (jokey)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox