From 82f9969f4f24ff232c92006702767491b4c1a241 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Tue, 27 Nov 2012 16:16:42 +0000 Subject: php: enable gettext and sqlite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Koen Kooi --- meta-oe/recipes-devtools/php/php.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 03b7b40b36..10dc154373 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -4,16 +4,16 @@ SECTION = "console/network" LICENSE = "PHP-3.0" BBCLASSEXTEND = "native" DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ - libc-client openssl" + libc-client openssl sqlite3" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r0" +INC_PR = "r1" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2" S = "${WORKDIR}/php-${PV}" -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig pythonnative gettext SSTATE_SCAN_FILES += "build-defs.h" @@ -22,6 +22,7 @@ COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared" EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \ --enable-magic-quotes --enable-fastcgi \ --with-imap=${STAGING_DIR_HOST} \ + --with-gettext=${STAGING_LIBDIR}/.. \ --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ @@ -29,8 +30,9 @@ EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \ --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" \ - --without-pdo-sqlite ${COMMON_EXTRA_OECONF} \ + --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \ " EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \ -- cgit 1.2.3-korg