Patchwork beecrypt: Add PACKAGECONFIG for cplusplus

login
register
mail settings
Submitter Richard Purdie
Date Nov. 26, 2013, 2:32 p.m.
Message ID <1385476348.11246.4.camel@ted>
Download mbox | patch
Permalink /patch/62407/
State Accepted
Commit 5048f59b5cb071b2ca893f24ee2aeb8d24a7e397
Headers show

Comments

Richard Purdie - Nov. 26, 2013, 2:32 p.m.
Add a PACKGECONFIG to control the building of the beecrypt C++
bindings. The only user of beecrypt in OE-Core is rpm and this doesn't
need the C++ bindings so default the option to be off. This means
we can lose the icu dependency by default which is a significant
performance win.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Paul Eggleton - Nov. 26, 2013, 3:55 p.m.
On Tuesday 26 November 2013 14:32:28 Richard Purdie wrote:
> Add a PACKGECONFIG to control the building of the beecrypt C++
> bindings. The only user of beecrypt in OE-Core is rpm and this doesn't
> need the C++ bindings so default the option to be off. This means
> we can lose the icu dependency by default which is a significant
> performance win.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
> b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb index 0a8ff4b..a917201
> 100644
> --- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
> +++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
> @@ -16,8 +16,6 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
> file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \
> file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297
> a4d71c1"
> 
> -DEPENDS = "icu"
> -
>  PR = "r3"
> 
>  inherit autotools multilib_header
> @@ -29,6 +27,9 @@ do_install_append() {
> 
>  EXTRA_OECONF="--without-python --enable-shared --enable-static
> --disable-openmp --with-java=no"
> 
> +PACKAGECONFIG = ""
> +PACKAGECONFIG[cplusplus] = "--with-cplusplus,--without-cplusplus,icu"
> +
>  FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*"
>  FILES_${PN}-dev += "${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la"
>  FILES_${PN}-staticdev += "${libdir}/${BPN}/*.a"

Not just a performance win, but a quick test with core-image-minimal + RPM + 
"package-management" in IMAGE_FEATURES showed that this also reduces the size 
of the final image by over 26MB. A nice optimisation all round :)

Cheers,
Paul

Patch

diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
index 0a8ff4b..a917201 100644
--- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
+++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
@@ -16,8 +16,6 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
                     file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \
                     file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297a4d71c1"
 
-DEPENDS = "icu"
-
 PR = "r3"
 
 inherit autotools multilib_header
@@ -29,6 +27,9 @@  do_install_append() {
 
 EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp --with-java=no"
 
+PACKAGECONFIG = ""
+PACKAGECONFIG[cplusplus] = "--with-cplusplus,--without-cplusplus,icu"
+
 FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*"
 FILES_${PN}-dev += "${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la"
 FILES_${PN}-staticdev += "${libdir}/${BPN}/*.a"