summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-php
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-10-07 03:08:55 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-27 12:50:09 +0100
commit0558ea06b14c45aabe04fa92df4f2765dac6aa49 (patch)
treef71cbade3a2785d349d709d7f2ef9bb51574392a /meta-webserver/recipes-php
parent374029acf30a3d81540482d348941e96cbd7999c (diff)
downloadmeta-openembedded-0558ea06b14c45aabe04fa92df4f2765dac6aa49.tar.gz
modphp, xdebug: blacklist because of conflict with php
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-php')
-rw-r--r--meta-webserver/recipes-php/modphp/modphp5.inc3
-rw-r--r--meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb1
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index c1cdf726e..0d7bb7a13 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -17,6 +17,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
17 17
18inherit autotools pkgconfig 18inherit autotools pkgconfig
19 19
20PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
21# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
22
20CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" 23CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"
21 24
22EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs \ 25EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs \
diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb b/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb
index ffff13565..750b28845 100644
--- a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb
+++ b/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16"
4 4
5DEPENDS = "modphp" 5DEPENDS = "modphp"
6 6
7PNBLACKLIST[xdebug] = "CONFLICT: depends on blocked modphp"
7 8
8SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" 9SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz"
9 10