summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsean finney <seanius@debian.org>2006-11-24 15:20:53 +0100
committerMark A. Hershberger <mah@debian.(none)>2009-03-25 00:37:03 -0400
commitfc2d2776264903fe62f297e939f77b070be77ad8 (patch)
treedf5d7cfeaf3ee2131e4fbfae79b7eeca325bf8eb
parent18dfb87afba8eb8c5baf97ea22cd8698ee3f4bb8 (diff)
downloadphp-fc2d2776264903fe62f297e939f77b070be77ad8.tar.gz
Imported Debian patch 5.2.0-7debian/5.2.0-7
-rw-r--r--debian/changelog8
-rwxr-xr-xdebian/rules4
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index a9c4c99b1..4c09441ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php5 (5.2.0-7) unstable; urgency=high
+
+ [ Steve Langasek ]
+ * Also disable firebird in the PDO config for archs other than
+ i386/amd64.
+
+ -- sean finney <seanius@debian.org> Fri, 24 Nov 2006 15:20:53 +0100
+
php5 (5.2.0-6) unstable; urgency=high
[ sean finney ]
diff --git a/debian/rules b/debian/rules
index 036ef0158..c01caa7c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,8 @@ endif
# only enable interbase support for i386/amd64
ifneq (,$(filter $(DEB_BUILD_ARCH),amd64 i386))
- IBFLAGS=--with-interbase=shared,/usr
+ IBFLAGS=--with-interbase=shared,/usr \
+ --with-pdo-firebird=shared,/usr
endif
COMMON_CONFIG=--build=$(PHP5_BUILD_GNU_TYPE)-gnu \
@@ -246,7 +247,6 @@ configure-apache2-stamp: patch-stamp
--with-pgsql=shared,/usr PGSQL_INCLUDE=`pg_config --includedir` \
--enable-pdo=shared \
--without-pdo-dblib \
- --with-pdo-firebird=shared,/usr \
--with-pdo-mysql=shared,/usr \
--with-pdo-odbc=shared,unixODBC,/usr \
--with-pdo-pgsql=shared,/usr/bin/pg_config \