aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/php/php.inc
diff options
context:
space:
mode:
authordengke.du@windriver.com <dengke.du@windriver.com>2017-05-09 03:54:33 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2017-05-23 15:49:36 +0200
commit6cd249225ecdd0a4592afe1844541378acae6cea (patch)
treeb84c1f9ab13a33e160cff362dfa0f21d363887e7 /meta-oe/recipes-devtools/php/php.inc
parent12436ba5ff647d69c0eadab7f4e5de42cf19f9ca (diff)
downloadmeta-openembedded-contrib-6cd249225ecdd0a4592afe1844541378acae6cea.tar.gz
meta-openembedded-contrib-6cd249225ecdd0a4592afe1844541378acae6cea.tar.bz2
meta-openembedded-contrib-6cd249225ecdd0a4592afe1844541378acae6cea.zip
php: fix install error for libphp*.so
Changed in V4: Add the tag: meta-oe 1. Different version php have different libphp*.so, so we need to install its corresponding libphp*.so, for example: php-7.1.0 libphp7.so php-5.6.26 libphp5.so 2. Fix php-5.6.26 compiling errors: ld: TSRM/.libs/TSRM.o: undefined reference to symbol 'pthread_sigmask@@GLIBC_2.2.5' error adding symbols: DSO missing from command line 3. Create a configure script like 70_mod_php5, we name it 70_mod_php7, this file connect the php7 and the apache2, so they work together to let the LAMP works correctly. Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php.inc')
-rw-r--r--meta-oe/recipes-devtools/php/php.inc18
1 files changed, 10 insertions, 8 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index d3ec9ded38..0e55020885 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -9,6 +9,8 @@ DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \
openssl libmcrypt"
DEPENDS_class-native = "zlib-native libxml2-native"
+PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}"
+
SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
file://acinclude-xml2-config.patch \
file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
@@ -24,7 +26,7 @@ SRC_URI_append_class-target = " \
file://php-fpm.conf \
file://php-fpm-apache.conf \
file://configure.patch \
- file://70_mod_php5.conf \
+ file://70_mod_php${PHP_MAJOR_VERSION}.conf \
file://php-fpm.service \
"
S = "${WORKDIR}/php-${PV}"
@@ -36,7 +38,7 @@ inherit autotools pkgconfig pythonnative gettext
SSTATE_SCAN_FILES += "phpize"
SSTATE_SCAN_FILES += "build-defs.h"
-PHP_LIBDIR = "${libdir}/php5"
+PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}"
# Common EXTRA_OECONF
COMMON_EXTRA_OECONF = "--enable-sockets \
@@ -57,7 +59,7 @@ EXTRA_OECONF = "--enable-mbstring \
--with-iconv=${STAGING_LIBDIR}/.. \
--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
--with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
- --with-config-file-path=${sysconfdir}/php/apache2-php5 \
+ --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
${COMMON_EXTRA_OECONF} \
@@ -175,13 +177,13 @@ do_install_append_class-target() {
if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then
install -d ${D}${libdir}/apache2/modules
install -d ${D}${sysconfdir}/apache2/modules.d
- install -d ${D}${sysconfdir}/php/apache2-php5
- install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules
- install -m 644 ${WORKDIR}/70_mod_php5.conf ${D}${sysconfdir}/apache2/modules.d
- sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php5.conf
+ install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}
+ install -m 755 libs/libphp${PHP_MAJOR_VERSION}.so ${D}${libdir}/apache2/modules
+ install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d
+ sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf
cat ${S}/php.ini-production | \
sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \
- > ${D}${sysconfdir}/php/apache2-php5/php.ini
+ > ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}/php.ini
rm -f ${D}${sysconfdir}/apache2/httpd.conf*
fi
}