[oe] [meta-oe][PATCHv2] php: add sqlite3 and mysql PACKAGECONFIG options

[Martin Jansa]

On Wed, Apr 17, 2013 at 03:41:35PM +0100, Jack Mitchell wrote:
> From: Jack Mitchell <jack.mitchell at dbbroadcast.co.uk>
> 
> Signed-off-by: Jack Mitchell <jack.mitchell at dbbroadcast.co.uk>
> ---
>  meta-oe/recipes-devtools/php/php.inc | 28 +++++++++++++++++++---------
>  1 file changed, 19 insertions(+), 9 deletions(-)
> 
> diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
> index 225c3d7..639aa01 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,21 @@ EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \
>                  ${COMMON_EXTRA_OECONF} \
>  "
>  
> +PACKAGECONFIG ??= "mysql sqlite3"
> +
> +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

php-native fails on jenkins with:
| configure:59644: result: no
| configure:60451: checking for MSSQL support via FreeTDS
| configure:60487: result: no
| configure:61111: checking for MySQL support
| configure:61147: result: yes
| configure:61156: checking for specified location of the MySQL UNIX socket
| configure:61171: result: no
| configure:61221: error: Cannot find MySQL header files under "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr".
| Note that the MySQL client library is not bundled anymore!

I guess you should force both disabled for native.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20130418/87638a40/attachment-0002.sig>