Skip to contentSkip to conversation

php: add PACKAGECONFIG options

PATCH Superseded Jack Mitchell 2 participants 7 messages Apr 19, 2013 – Apr 23, 2013

lore
Share & tools
lore
#0 lore raw

v4 cover php: add PACKAGECONFIG options

From: Jack Mitchell <[email protected]>

This change is on top of Marcin's PHP 5.4.14 upgrade

Jack Mitchell (2):
php: add sqlite3 and mysql PACKAGECONFIG options
php: remove non-existant configure flags and improve current ones

 meta-oe/recipes-devtools/php/php.inc | 38 +++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 14 deletions(-)
Signature · 1 line
1.8.2.1
#1 lore raw

PATCH v4 1/2 php: add sqlite3 and mysql PACKAGECONFIG options

From: Jack Mitchell <[email protected]>

---
 meta-oe/recipes-devtools/php/php.inc | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
meta-oe/recipes-devtools/php/php.inc +20 -9
index 225c3d7..892a0b5 100644
@@ -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
Signature · 1 line
1.8.2.1
#2 lore raw

Re: [PATCH 1/2] php: add sqlite3 and mysql PACKAGECONFIG options

Quoted 65 lines · Jack Mitchell

From: Jack Mitchell <[email protected]>

---
 meta-oe/recipes-devtools/php/php.inc | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
meta-oe/recipes-devtools/php/php.inc +20 -9
index 225c3d7..892a0b5 100644
@@ -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
Signature · 1 line
1.8.2.1

Now target php is failing with:
| configure:61165: result: no
| configure:61215: error: Cannot find MySQL header files under "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr". | Note that the MySQL client library is not bundled anymore!

full log here:
qemuarm
http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130422_080202.log/bitbake.world.log

qemux86
http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130422_125516.log/bitbake.world.log

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

Re: [PATCH 1/2] php: add sqlite3 and mysql PACKAGECONFIG options

Quoted 72 lines · Martin Jansa
Quoted 65 lines · Jack Mitchell

From: Jack Mitchell <[email protected]>

---
  meta-oe/recipes-devtools/php/php.inc | 29 ++++++++++++++++++++---------
  1 file changed, 20 insertions(+), 9 deletions(-)
meta-oe/recipes-devtools/php/php.inc +20 -9
index 225c3d7..892a0b5 100644
@@ -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
Signature · 1 line
1.8.2.1

Now target php is failing with:
| configure:61165: result: no
| configure:61215: error: Cannot find MySQL header files under "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr". | Note that the MySQL client library is not bundled anymore!

Quoted 7 lines

full log here:
qemuarm
http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130422_080202.log/bitbake.world.log

qemux86
http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130422_125516.log/bitbake.world.log

I don't know what is going on here as I can't trigger it my end, possibly a race condition? I wouldn't think so though, as mysql5 is a direct depends of php.

[09:42:58 jack ccoR0005]$ bitbake -c cleansstate mysql5 php
Loading cache: 100% |#################################################################################| ETA: 00:00:00 Loaded 64 entries from dependency cache.
Parsing recipes: 100% |###############################################################################| Time: 00:00:15 Parsing of 852 .bb files complete (46 cached, 806 parsed). 1162 targets, 110 skipped, 0 masked, 0 errors.
WARNING: No bb files matched BBFILE_PATTERN_dblinux '^/mnt/SSD/oe-r0005/meta-dblinux/'

Build Configuration:

BB_VERSION        = "1.19.0"
BUILD_SYS         = "x86_64-linux"
NATIVELSBSTRING   = "Unknown"
TARGET_SYS        = "arm-oecore-linux-gnueabi"
MACHINE           = "beaglebone"
DISTRO            = "dblinux"
DISTRO_VERSION    = "1.0-20130423"
TUNE_FEATURES     = "armv7a vfp neon"
TARGET_FPU        = "vfp-neon"
meta              = "master:548fdb44bed180f05255f0ec25d18e673dce19a7"
meta-webserver    = "master:c56a702d21510157c753c48bcac8e21bbcd90a2b"
meta-db           = "master:4b608673b2928f851d379b7b1bb2d3f18c46dbac"
meta-dblinux      = "master:0abe0ab71c58cddcee35d1068f3606dacc9a1d09"
common-bsp        = "master:6d12438278bbf575c43c19262d48458a90cfe2af"

NOTE: Resolving any missing task queue dependencies
NOTE: Preparing runqueue
NOTE: Executing RunQueue Tasks
NOTE: Tasks Summary: Attempted 4 tasks of which 0 didn't need to be rerun and all succeeded.

Summary: There was 1 WARNING message shown.
[09:43:42 jack ccoR0005]$ bitbake php
Loading cache: 100% |#################################################################################| ETA: 00:00:00 Loaded 1158 entries from dependency cache.
Parsing recipes: 100% |###############################################################################| Time: 00:00:01 Parsing of 852 .bb files complete (847 cached, 5 parsed). 1162 targets, 110 skipped, 0 masked, 0 errors.
WARNING: No bb files matched BBFILE_PATTERN_dblinux '^/mnt/SSD/oe-r0005/meta-dblinux/'

Build Configuration:

BB_VERSION        = "1.19.0"
BUILD_SYS         = "x86_64-linux"
NATIVELSBSTRING   = "Unknown"
TARGET_SYS        = "arm-oecore-linux-gnueabi"
MACHINE           = "beaglebone"
DISTRO            = "dblinux"
DISTRO_VERSION    = "1.0-20130423"
TUNE_FEATURES     = "armv7a vfp neon"
TARGET_FPU        = "vfp-neon"
meta              = "master:548fdb44bed180f05255f0ec25d18e673dce19a7"
meta-webserver    = "master:c56a702d21510157c753c48bcac8e21bbcd90a2b"
meta-db           = "master:4b608673b2928f851d379b7b1bb2d3f18c46dbac"
meta-dblinux      = "master:0abe0ab71c58cddcee35d1068f3606dacc9a1d09"
common-bsp        = "master:6d12438278bbf575c43c19262d48458a90cfe2af"

NOTE: Resolving any missing task queue dependencies
NOTE: Preparing runqueue
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
NOTE: Tasks Summary: Attempted 1322 tasks of which 738 didn't need to be rerun and all succeeded.

Summary: There was 1 WARNING message shown.
[10:06:39 jack ccoR0005]$

Signature · 5 lines
  Jack Mitchell ([email protected])
  Embedded Systems Engineer
  http://www.embed.me.uk

--
#4 lore raw

PATCH v5 1/1 php: add sqlite3 and mysql PACKAGECONFIG options

In reply to Martin Jansa

From: Jack Mitchell <[email protected]>

---
 meta-oe/recipes-devtools/php/php.inc | 38 +++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 14 deletions(-)
meta-oe/recipes-devtools/php/php.inc +24 -14
index 225c3d7..749f51c 100644
@@ -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"
 
@@ -19,27 +19,37 @@ SSTATE_SCAN_FILES += "build-defs.h"
 
 # Common EXTRA_OECONF
 COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared"
-EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \
-                --enable-magic-quotes --enable-fastcgi --enable-fpm \
+EXTRA_OECONF = "--enable-mbstring \
+                --enable-wddx \
+                --enable-fpm \
                 --with-imap=${STAGING_DIR_HOST} \
                 --with-gettext=${STAGING_LIBDIR}/.. \
                 --with-imap-ssl=${STAGING_DIR_HOST} \
-                --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
+                --with-zlib=${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}/.. \
+EXTRA_OECONF_virtclass-native = " \
+                --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \
                 --with-libxml-dir=${STAGING_BINDIR_NATIVE} \
                 ${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 \
+                        , \
+                        ,mysql5"
+
+PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
+                          --with-pdo-sqlite=${STAGING_LIBDIR}/.. \
+                          , \
+                          ,sqlite3"
+
 LIBS_virtclass-native = " -lxml2 "
 LIBS_pn-php =" -lpthread "
 export LIBS
Signature · 1 line
1.8.2.1
#5 lore raw

Re: [meta-oe][PATCH v5] php: add sqlite3 and mysql PACKAGECONFIG options

Quoted 65 lines · Jack Mitchell

From: Jack Mitchell <[email protected]>

---
  meta-oe/recipes-devtools/php/php.inc | 38 +++++++++++++++++++++++-------------
  1 file changed, 24 insertions(+), 14 deletions(-)
meta-oe/recipes-devtools/php/php.inc +17 -14
index 225c3d7..749f51c 100644
@@ -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"
 
@@ -19,27 +19,37 @@ SSTATE_SCAN_FILES += "build-defs.h"
 
  # Common EXTRA_OECONF
  COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared"
-EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \
-                --enable-magic-quotes --enable-fastcgi --enable-fpm \
+EXTRA_OECONF = "--enable-mbstring \
+                --enable-wddx \
+                --enable-fpm \
                  --with-imap=${STAGING_DIR_HOST} \
                  --with-gettext=${STAGING_LIBDIR}/.. \
                  --with-imap-ssl=${STAGING_DIR_HOST} \
-                --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
+                --with-zlib=${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}/.. \
+EXTRA_OECONF_virtclass-native = " \
+                --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \
                  --with-libxml-dir=${STAGING_BINDIR_NATIVE} \
                  ${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 \
+                        , \

meta-oe/recipes-devtools/php/php.inc SSTATE_SCAN_FILES += "build-defs.h" · line 55

Quoted 10 lines
meta-oe/recipes-devtools/php/php.inc +7 -0
+                        ,mysql5"
+
+PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
+                          --with-pdo-sqlite=${STAGING_LIBDIR}/.. \
+                          , \
+                          ,sqlite3"
+
  LIBS_virtclass-native = " -lxml2 "
  LIBS_pn-php =" -lpthread "
  export LIBS

The patch in my repo has somehow become munged, this is the exact changes I have which is building correctly as above. I don't know how they got joined, but they did. This negates the need for 2/2 of this patchset, it's all rolled in.

Sorry for the saga this is becoming!

Signature · 5 lines
  Jack Mitchell ([email protected])
  Embedded Systems Engineer
  http://www.embed.me.uk

--
#6 lore raw

PATCH v4 2/2 php: remove non-existant configure flags and improve current ones

In reply to Jack Mitchell

From: Jack Mitchell <[email protected]>

- The removed flags no longer exist anywhere in the PHP source, remove them.

- Clean up some whitespace and make the recipe a little bit more readable.

- --with-zlib-dir is not needed as zlib dir can be specified with --with-zlib=dir flag.

---
 meta-oe/recipes-devtools/php/php.inc | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
meta-oe/recipes-devtools/php/php.inc +9 -10
index 892a0b5..64f6d74 100644
@@ -19,18 +19,19 @@ SSTATE_SCAN_FILES += "build-defs.h"
 
 # Common EXTRA_OECONF
 COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared"
-EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \
-                --enable-magic-quotes --enable-fastcgi --enable-fpm \
+EXTRA_OECONF = "--enable-mbstring \
+                --enable-wddx \
+                --enable-fpm \
                 --with-imap=${STAGING_DIR_HOST} \
                 --with-gettext=${STAGING_LIBDIR}/.. \
                 --with-imap-ssl=${STAGING_DIR_HOST} \
-                --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
+                --with-zlib=${STAGING_LIBDIR}/.. \
                 --with-iconv=${STAGING_LIBDIR}/.. \
                 --with-libxml-dir=${STAGING_BINDIR_CROSS} \
                 ${COMMON_EXTRA_OECONF} \
 "
-EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \
-                --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \
+EXTRA_OECONF_virtclass-native = " \
+                --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \
                 --with-libxml-dir=${STAGING_BINDIR_NATIVE} \
                 ${COMMON_EXTRA_OECONF} \
 "
@@ -41,15 +42,13 @@ 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"
+                          --with-pdo-sqlite=${STAGING_LIBDIR}/.. \
+                          , \
+                          ,sqlite3"
 
 LIBS_virtclass-native = " -lxml2 "
 LIBS_pn-php =" -lpthread "
Signature · 1 line
1.8.2.1