1 files changed, 1 insertions, 1 deletions
diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index dcafa4fc3..f60c7bbfc 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
 inherit autotools pkgconfig
-PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
+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"

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc index dcafa4fc3..f60c7bbfc 100644 --- a/meta-webserver/recipes-php/modphp/modphp5.inc +++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
20		20
21	inherit autotools pkgconfig	21	inherit autotools pkgconfig
22		22
23	PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"	23	PNBLACKLIST[modphp] ?= "CONFLICT: 466 header files conflict with php"
24	# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h	24	# e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
25		25
26	CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"	26	CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"