Patchwork [RFC,2/3] opkg: Add PACKAGECONFIG options

login
register
mail settings
Submitter Paul Barker
Date Nov. 20, 2013, 4:41 p.m.
Message ID <1384965670-23435-3-git-send-email-paul@paulbarker.me.uk>
Download mbox | patch
Permalink /patch/62039/
State Accepted
Commit 9339da20dba6e6c7867b4fb33d0eb7693f5784c1
Headers show

Comments

Paul Barker - Nov. 20, 2013, 4:41 p.m.
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@paulbarker.me.uk>
---
 meta/recipes-devtools/opkg/opkg.inc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

Patch

diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index fb99fb5..d16b8c2 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -27,15 +27,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"