From: Jack Mitchell <[email protected]>

Signed-off-by: Jack Mitchell <[email protected]>
---
 meta-oe/recipes-devtools/php/php.inc | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-devtools/php/php.inc 
b/meta-oe/recipes-devtools/php/php.inc
index 225c3d7..892a0b5 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -3,11 +3,11 @@ HOMEPAGE = "http://www.php.net";
 SECTION = "console/network"
 LICENSE = "PHP-3.0"
 BBCLASSEXTEND = "native"
-DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
-           libc-client openssl sqlite3"
+DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native \
+           libc-client openssl"
 DEPENDS_virtclass-native = "zlib-native libxml2-native"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2";
 
@@ -27,12 +27,7 @@ EXTRA_OECONF = "--enable-mbstring --enable-discard-path 
--enable-wddx \
                 --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
                 --with-iconv=${STAGING_LIBDIR}/.. \
                 --with-libxml-dir=${STAGING_BINDIR_CROSS} \
-                --disable-embedded-mysqli \
-                --with-mysql="${STAGING_DIR_TARGET}${prefix}" \
-                --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \
-        --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \
-                --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \
-                --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \
+                ${COMMON_EXTRA_OECONF} \
 "
 EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg 
\
                 --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \
@@ -40,6 +35,22 @@ EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng 
--without-libjpeg \
                 ${COMMON_EXTRA_OECONF} \
 "
 
+PACKAGECONFIG ??= "mysql sqlite3"
+PACKAGECONFIG_class-native = ""
+
+PACKAGECONFIG[mysql] = "--with-mysql=\"${STAGING_DIR_TARGET}${prefix}\" \
+                        --with-mysqli=\"${STAGING_BINDIR_CROSS}/mysql_config\" 
\
+                        
--with-pdo-mysql=\"${STAGING_BINDIR_CROSS}/mysql_config\" \
+                        --disable-embedded-mysqli \
+                        , \
+                        ,mysql5"
+
+PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
+                        --enable-sqlite-utf8 \
+                        --with-pdo-sqlite=${STAGING_LIBDIR}/.. \
+                        , \
+                        ,sqlite3"
+
 LIBS_virtclass-native = " -lxml2 "
 LIBS_pn-php =" -lpthread "
 export LIBS
-- 
1.8.2.1


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Reply via email to