diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-06 08:01:57 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-17 12:55:40 +0100 |
commit | 96a92761c0a1bb2317fa4ea422c32e4473405103 (patch) | |
tree | e2fab4282e2049a333927f5a604676ea3ca0553a /meta-webserver | |
parent | 1e9d3afe66d9e99904f9ce2730c33bdf47060499 (diff) | |
download | meta-openembedded-96a92761c0a1bb2317fa4ea422c32e4473405103.tar.gz |
PNBLACKLIST: use weak assignments
* this makes it easier to unblacklist it from local.conf which
is parsed before the recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r-- | meta-webserver/recipes-php/modphp/modphp5.inc | 2 | ||||
-rw-r--r-- | meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | 2 |
2 files changed, 2 insertions, 2 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" | |||
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" |
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 750b28845..66aff5e33 100644 --- a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb +++ b/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16" | |||
4 | 4 | ||
5 | DEPENDS = "modphp" | 5 | DEPENDS = "modphp" |
6 | 6 | ||
7 | PNBLACKLIST[xdebug] = "CONFLICT: depends on blocked modphp" | 7 | PNBLACKLIST[xdebug] ?= "CONFLICT: depends on blocked modphp" |
8 | 8 | ||
9 | SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" | 9 | SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" |
10 | 10 | ||