All of lore.kernel.org
 help / color / mirror / Atom feed
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2, 2/2] package/jq: add oniguruma optional dependency
Date: Wed, 20 Mar 2019 21:36:17 +0100	[thread overview]
Message-ID: <20190320203617.27496-2-fontaine.fabrice@gmail.com> (raw)
In-Reply-To: <20190320203617.27496-1-fontaine.fabrice@gmail.com>

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2:
 - Always enable oniguruma on host-jq

 package/jq/jq.mk | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/package/jq/jq.mk b/package/jq/jq.mk
index aebe8c86e4..d8cab80c9a 100644
--- a/package/jq/jq.mk
+++ b/package/jq/jq.mk
@@ -17,8 +17,18 @@ JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE"
 HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99 -D_GNU_SOURCE"
 
 # jq explicitly enables maintainer mode, which we don't need/want
-JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
-HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
+JQ_CONF_OPTS += --disable-maintainer-mode
+HOST_JQ_CONF_OPTS += --disable-maintainer-mode
+
+HOST_JQ_CONF_OPTS += --with-oniguruma
+HOST_JQ_DEPENDENCIES += host-oniguruma
+
+ifeq ($(BR2_PACKAGE_ONIGURUMA),y)
+JQ_DEPENDENCIES += oniguruma
+JQ_CONF_OPTS += --with-oniguruma
+else
+JQ_CONF_OPTS += --without-oniguruma
+endif
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
2.14.1

  reply	other threads:[~2019-03-20 20:36 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-20 20:36 [Buildroot] [PATCH v2,1/2] package/oniguruma: new package Fabrice Fontaine
2019-03-20 20:36 ` Fabrice Fontaine [this message]
2019-03-31 13:14   ` [Buildroot] [PATCH v2, 2/2] package/jq: add oniguruma optional dependency Thomas Petazzoni
2019-03-31 13:27     ` Fabrice Fontaine
2019-03-31 13:33       ` Thomas Petazzoni
2019-03-31 13:13 ` [Buildroot] [PATCH v2,1/2] package/oniguruma: new package Thomas Petazzoni
2019-03-31 15:12 Fabrice Fontaine
2019-03-31 15:12 ` [Buildroot] [PATCH v2, 2/2] package/jq: add oniguruma optional dependency Fabrice Fontaine

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=20190320203617.27496-2-fontaine.fabrice@gmail.com \
    --to=fontaine.fabrice@gmail.com \
    --cc=buildroot@busybox.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.