[oe-commits] Paul Barker : opkg: Add PACKAGECONFIG options

[git at git.openembedded.org]

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

Author: Paul Barker <paul at paulbarker.me.uk>
Date:   Wed Nov 20 16:41:09 2013 +0000

opkg: Add PACKAGECONFIG options

Instead of hardcoding EXTRA_OECONF to disable things, we add PACKAGECONFIG
options for gpg, curl, ssl-curl, openssl, sha256 and pathfinder. By default all
these options are disabled.

Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/opkg/opkg.inc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 6bfdbd7..416fb54 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -26,15 +26,18 @@ python () {
 target_localstatedir := "${localstatedir}"
 OPKGLIBDIR = "${target_localstatedir}/lib"
 
-SHARED_EXTRA_OECONF = "\
+PACKAGECONFIG ??= ""
+
+PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error"
+PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
+PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
+PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
+PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
+PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder"
+
+EXTRA_OECONF = "\
   --with-opkglibdir=${OPKGLIBDIR} \
-  --disable-gpg \
-  --disable-curl \
-  --disable-openssl \
 "
-EXTRA_OECONF_class-target = "${SHARED_EXTRA_OECONF} --disable-ssl-curl --disable-sha256"
-EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF}"
-EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF}"
 
 PROVIDES += "virtual/update-alternatives"
 RPROVIDES_update-alternatives-cworth += "update-alternatives"