From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/7] sqlite3.inc: fix readline PACKAGECONFIG
Date: Fri, 22 Jan 2016 17:26:00 -0800 [thread overview]
Message-ID: <1453512366-11405-3-git-send-email-armccurdy@gmail.com> (raw)
In-Reply-To: <1453512366-11405-1-git-send-email-armccurdy@gmail.com>
Make it clearer that readline support for the target build is now
disabled by default.
Since readline dependencies and configure options are now handled by
PACKAGECONFIG, avoid duplicating readline in DEPENDS or duplicating
--disable-readline in EXTRA_OECONF.
Also add --disable-editline to EXTRA_OECONF to avoid a potential
floating dependency, since the configure script checks for libedit
before it checks for libreadline.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-support/sqlite/sqlite3.inc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 5eb5de3..7245285 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -1,15 +1,16 @@
SUMMARY = "Embeddable SQL database engine"
HOMEPAGE = "http://www.sqlite.org"
SECTION = "libs"
-DEPENDS = "readline ncurses"
-DEPENDS_class-native = ""
LICENSE = "PD"
inherit autotools pkgconfig
-EXTRA_OECONF = "--enable-shared --enable-threadsafe"
-EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline"
-PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
+PACKAGECONFIG ?= ""
+PACKAGECONFIG_class-native = ""
+
+PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses"
+
+EXTRA_OECONF = "--enable-shared --enable-threadsafe --disable-editline"
export config_BUILD_CC = "${BUILD_CC}"
export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"
--
1.9.1
next prev parent reply other threads:[~2016-01-23 1:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-23 1:25 [PATCH 0/7] sqlite3: misc fixes, cleanup + update 3.10.0 -> 3.10.2 Andre McCurdy
2016-01-23 1:25 ` [PATCH 1/7] sqlite3: fix the parallel build fix patch Andre McCurdy
2016-01-23 1:26 ` Andre McCurdy [this message]
2016-01-23 1:26 ` [PATCH 3/7] sqlite3.inc: drop obsolete config_BUILD_CC, etc exports Andre McCurdy
2016-01-23 1:26 ` [PATCH 4/7] sqlite: formatting improvements, move more stuff into sqlite3.inc Andre McCurdy
2016-01-23 1:26 ` [PATCH 5/7] sqlite3.inc: dynamically link the sqlite3 command-line utility Andre McCurdy
2016-01-23 1:26 ` [PATCH 6/7] sqlite3.inc: add PACKAGECONFIG to support building against libedit Andre McCurdy
2016-01-23 1:26 ` [PATCH 7/7] sqlite3: update 3.10.0 -> 3.10.2 Andre McCurdy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453512366-11405-3-git-send-email-armccurdy@gmail.com \
--to=armccurdy@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox