diff options
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" |