From d7df8092c2be4c984d9292749f6cfa7ce41cbb53 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 19 Sep 2016 16:17:31 +0200 Subject: enchant: add PACKAGECONFIG for *spell * use PACKAGECONFIG for various *spell implementations * keep aspell enabled by default * prevent hunspell/myspell being autodetected as reported in "bitbake world status" e-mails: WARN: enchant: enchant rdepends on hunspell, but it isn't a build dependency? Signed-off-by: Martin Jansa Signed-off-by: Ross Burton --- meta/recipes-support/enchant/enchant_1.6.0.bb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'meta/recipes-support/enchant') diff --git a/meta/recipes-support/enchant/enchant_1.6.0.bb b/meta/recipes-support/enchant/enchant_1.6.0.bb index 97a47614cd..44eb2e3df4 100644 --- a/meta/recipes-support/enchant/enchant_1.6.0.bb +++ b/meta/recipes-support/enchant/enchant_1.6.0.bb @@ -7,7 +7,7 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dfcbabf9131dc9a95febef6753a2958b \ file://src/enchant.h;beginline=1;endline=29;md5=8d881caa1d37523567e1d8f726675a18" -DEPENDS = "aspell glib-2.0" +DEPENDS = "glib-2.0" inherit autotools pkgconfig @@ -18,15 +18,17 @@ SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz SRC_URI[md5sum] = "de11011aff801dc61042828041fb59c7" SRC_URI[sha256sum] = "2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f" -EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \ - --enable-aspell br_cv_binreloc=no \ - " +PACKAGECONFIG ??= "aspell" +PACKAGECONFIG[aspell] = " --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-aspell, --disable-aspell, aspell, aspell" +PACKAGECONFIG[ispell] = " --with-ispell-prefix=${STAGING_DIR_HOST}${prefix} --enable-ispell, --disable-ispell, ispell, ispell" +PACKAGECONFIG[uspell] = " --with-uspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-uspell, --disable-uspell, uspell, uspell" +PACKAGECONFIG[hspell] = " --with-hspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-hspell, --disable-hspell, hspell, hspell" +PACKAGECONFIG[myspell] = "--with-myspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-myspell, --disable-myspell, myspell, myspell" + +EXTRA_OECONF = "br_cv_binreloc=no" export CXXFLAGS += " -L${STAGING_LIBDIR} -lstdc++ " FILES_${PN} = "${bindir} ${libdir}/*${SOLIBS} ${datadir}/${BPN} ${libdir}/${BPN}/*.so" FILES_${PN}-dev += "${libdir}/${BPN}/*{SOLIBSDEV} ${libdir}/${BPN}/*.la" FILES_${PN}-staticdev += "${libdir}/${BPN}/*.a" - -RDEPENDS_${PN} += "aspell" - -- cgit 1.2.3-korg