summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-02-19 16:58:14 +0100
committerKoen Kooi <koen@openembedded.org>2009-02-19 16:58:14 +0100
commitd712bfd490d7899c32d8768f59a1165a344764f2 (patch)
treeb465340cff5b6c68407f7ef55ec2738a5e6e6c5e
parent31f5fe8e7fcc51474245d07483e2698f64a3b460 (diff)
parent8c1c046f7e136ece107df20ca4d93474886144b4 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--packages/php/php-native.inc2
-rw-r--r--packages/php/php-native_5.2.6.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/php/php-native.inc b/packages/php/php-native.inc
index 84f9a1a0ee..1698a80379 100644
--- a/packages/php/php-native.inc
+++ b/packages/php/php-native.inc
@@ -7,7 +7,7 @@ export LIBS=" -lxml2 "
export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \
- --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE} \
+ --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \
--without-libpng --without-libjpeg \
--with-libxml-dir=${STAGING_BINDIR_NATIVE} \
"
diff --git a/packages/php/php-native_5.2.6.bb b/packages/php/php-native_5.2.6.bb
index 97064a6510..ac1c51fa3f 100644
--- a/packages/php/php-native_5.2.6.bb
+++ b/packages/php/php-native_5.2.6.bb
@@ -1,3 +1,3 @@
require php-native.inc
-PR = "r2"
+PR = "r3"