summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/php
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-devtools/php')
-rw-r--r--meta-oe/recipes-devtools/php/php.inc10
-rw-r--r--meta-oe/recipes-devtools/php/php/phar-makefile.patch8
-rw-r--r--meta-oe/recipes-devtools/php/php_5.3.19.bb2
3 files changed, 10 insertions, 10 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 29e82fa716..176d4a1c54 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -30,15 +30,15 @@ EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \
30 --disable-embedded-mysqli \ 30 --disable-embedded-mysqli \
31 --with-mysql="${STAGING_DIR_TARGET}${prefix}" \ 31 --with-mysql="${STAGING_DIR_TARGET}${prefix}" \
32 --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \ 32 --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \
33 --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \ 33 --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \
34 --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \ 34 --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \
35 --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \ 35 --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \
36 " 36"
37EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \ 37EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \
38 --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \ 38 --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \
39 --with-libxml-dir=${STAGING_BINDIR_NATIVE} \ 39 --with-libxml-dir=${STAGING_BINDIR_NATIVE} \
40 ${COMMON_EXTRA_OECONF} \ 40 ${COMMON_EXTRA_OECONF} \
41 " 41"
42 42
43LIBS_virtclass-native = " -lxml2 " 43LIBS_virtclass-native = " -lxml2 "
44LIBS_pn-php =" -lpthread " 44LIBS_pn-php =" -lpthread "
@@ -82,8 +82,8 @@ do_install_append_pn-php() {
82 install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm 82 install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm
83 TMP=`dirname ${D}/${TMPDIR}` 83 TMP=`dirname ${D}/${TMPDIR}`
84 while test ${TMP} != ${D}; do 84 while test ${TMP} != ${D}; do
85 rmdir ${TMP} 85 rmdir ${TMP}
86 TMP=`dirname ${TMP}`; 86 TMP=`dirname ${TMP}`;
87 done 87 done
88} 88}
89 89
diff --git a/meta-oe/recipes-devtools/php/php/phar-makefile.patch b/meta-oe/recipes-devtools/php/php/phar-makefile.patch
index 6fde251275..9d1dc7b9ae 100644
--- a/meta-oe/recipes-devtools/php/php/phar-makefile.patch
+++ b/meta-oe/recipes-devtools/php/php/phar-makefile.patch
@@ -4,8 +4,8 @@ index fc93d1d..9a8cd65 100755
4+++ b/ext/phar/Makefile.frag 4+++ b/ext/phar/Makefile.frag
5@@ -6,19 +6,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar 5@@ -6,19 +6,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
6 6
7 PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' 7 PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0'
8 PHP_PHARCMD_EXECUTABLE = ` \ 8 PHP_PHARCMD_EXECUTABLE = ` \
9- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ 9- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
10- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ 10- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
11- if test "x$(PHP_MODULES)" != "x"; then \ 11- if test "x$(PHP_MODULES)" != "x"; then \
@@ -21,6 +21,6 @@ index fc93d1d..9a8cd65 100755
21- fi;` 21- fi;`
22+ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; ` 22+ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; `
23+ 23+
24 PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` 24 PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
25 25
26 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc 26 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
diff --git a/meta-oe/recipes-devtools/php/php_5.3.19.bb b/meta-oe/recipes-devtools/php/php_5.3.19.bb
index 8204104b7f..0ce811300b 100644
--- a/meta-oe/recipes-devtools/php/php_5.3.19.bb
+++ b/meta-oe/recipes-devtools/php/php_5.3.19.bb
@@ -16,7 +16,7 @@ SRC_URI_append_pn-php += "file://iconv.patch \
16 file://fix-fpm-cross-compile.patch \ 16 file://fix-fpm-cross-compile.patch \
17 file://php-fpm.conf \ 17 file://php-fpm.conf \
18 file://php-fpm-apache.conf \ 18 file://php-fpm-apache.conf \
19 " 19"
20 20
21SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" 21SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"
22SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6" 22SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"