summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-05-18 19:54:14 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-05-18 19:54:14 +0000
commitdb96081b9d6c015ec77dbdcfe122fb785abfb68c (patch)
tree431f84723c95f9828d2ccf8b5d2b5d1ba6ff3d1d /packages
parent81ab9b94748aa8eee7c9511206c9d95d6f986719 (diff)
parent79ff83371cd1be7c68d56b35e5679c4944ab3e54 (diff)
merge of '2a95914087586c7f511061dd7404c0f44fc9ce24'
and '595d3bb20485f41ca08f2f400d9c3a3c7106db90'
Diffstat (limited to 'packages')
-rw-r--r--packages/php/php_5.2.5.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/php/php_5.2.5.bb b/packages/php/php_5.2.5.bb
index 890d467c10..a8dc83a444 100644
--- a/packages/php/php_5.2.5.bb
+++ b/packages/php/php_5.2.5.bb
@@ -1,6 +1,6 @@
require php.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://pear-makefile.patch;patch=1 "
@@ -19,7 +19,7 @@ EXTRA_OECONF = " --without-iconv \
--with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \
"
-EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR}"
+EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR_CROSS}"
export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}"