[oe-commits] Martin Jansa : modphp, xdebug: blacklist because of conflict with php

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: a9a8dca5bb9ce8e1c10f2bd0b5273256ecdfa892
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=a9a8dca5bb9ce8e1c10f2bd0b5273256ecdfa892

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Oct  7 03:08:55 2014 +0200

modphp, xdebug: blacklist because of conflict with php

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-webserver/recipes-php/modphp/modphp5.inc     | 3 +++
 meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | 1 +
 2 files changed, 4 insertions(+)

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index 6932429..8707950 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -14,6 +14,9 @@ S = "${WORKDIR}/php-${PV}"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
 
+PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
+# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
+
 inherit autotools
 
 CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"
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 ffff135..750b288 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"