diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-07 03:08:55 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-27 12:50:09 +0100 |
| commit | 0558ea06b14c45aabe04fa92df4f2765dac6aa49 (patch) | |
| tree | f71cbade3a2785d349d709d7f2ef9bb51574392a /meta-webserver | |
| parent | 374029acf30a3d81540482d348941e96cbd7999c (diff) | |
| download | meta-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')
| -rw-r--r-- | meta-webserver/recipes-php/modphp/modphp5.inc | 3 | ||||
| -rw-r--r-- | meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | 1 |
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 c1cdf726e1..0d7bb7a13c 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" inherit autotools pkgconfig +PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php" +# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h + CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" EXTRA_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 ffff13565e..750b288458 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" DEPENDS = "modphp" +PNBLACKLIST[xdebug] = "CONFLICT: depends on blocked modphp" SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" |