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

[git at git.openembedded.org]

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

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

modphp: blacklist because of conflict with php

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

---

 meta-webserver/recipes-php/modphp/modphp5.inc | 3 +++
 1 file changed, 3 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"