From patchwork Wed Mar 20 20:29:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1059530 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M4g2FSyg"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44PhP10M17z9sQx for ; Thu, 21 Mar 2019 07:29:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5BE9D85DCA; Wed, 20 Mar 2019 20:29:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JKcamGgfPxda; Wed, 20 Mar 2019 20:29:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D5975856E8; Wed, 20 Mar 2019 20:29:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2BD7F1BF40F for ; Wed, 20 Mar 2019 20:29:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2776687670 for ; Wed, 20 Mar 2019 20:29:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xDF3JldnrmNP for ; Wed, 20 Mar 2019 20:29:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by hemlock.osuosl.org (Postfix) with ESMTPS id 61E458763F for ; Wed, 20 Mar 2019 20:29:48 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id 4so61216wmf.1 for ; Wed, 20 Mar 2019 13:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VK0HCWPuEenIlWMmEfNLR0FYx8fw54u6jkZbifp8CCU=; b=M4g2FSygaoM9g6G/646yST5EklS0ZICCmWv9woIYnUWfR3E3aIqo8gz/7eD71A7ERy N24r8WJpXCLzaHDtHok32P/uvBA6m5S9sOj60ztbbGXBqk+lli2v+0vzphmy+tOnM3Ks y/fpxu8gg7DEIl9OLiVQ1sB0A0ggt3so1pLvROtb3dXaNkLh+J/AfGN7Oh0M0zbKgbTM 7QLL3vNq06+JFdMgBsjnKOm5uRV3/R0UXZp0AP/8dWFSICQh2rFGYvNP/tXt5Pd4q39i A8ITH1Kb4TjCvkgVyOUoMxEy4Yh8DVbhBF4MqJFiCnbaQam2vWSnb7aV2ysUWdz0Ao/R kixQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VK0HCWPuEenIlWMmEfNLR0FYx8fw54u6jkZbifp8CCU=; b=Gii2aqX1uMaQU39dDoUsfsRz01UlzWzV85dDP5dUn+VEc932iAjK0JNtmNf2wkwufJ uP0SuIAqJFYxnWLP6Rb58MDXe9xNO57MQ8281M4ia30g3PO39aipQ/qLVXpTy7/kKUCK XJgm3t0o4TT4VuTWOMYYyxtF/uWUfArgU/IcDnZFc4Kw5nsk8pV+HBZJhfM/u9+xkuA2 PNCCRg+dQpb/MCXrf/0m4e5mUOl7nQNeuzESs1Q7Z8xkRW5yeD2MDcCIf+8RfZZAZ8U6 0Yc43PC9GySs7ABd9/L3AaKgViqcw91jLjPok9JrVlLeNZ+4SLtGzvC0d0t7MUVe8XeU mhhw== X-Gm-Message-State: APjAAAXuDmOUHKeOXoKMWH0dRJqeYQvy2egCXKW99sNK0rWtgA0lrTzs ugZZFHNejVAewN2j3buPC93snCRn X-Google-Smtp-Source: APXvYqy7vZkqJAMtCJMgSpBxAHpRVcQSsUvZSMxlcqkp2L68R8Hgvr7DT1Z6Lvm4YKWElkW3q7jJlQ== X-Received: by 2002:a1c:7a03:: with SMTP id v3mr122719wmc.59.1553113786636; Wed, 20 Mar 2019 13:29:46 -0700 (PDT) Received: from fabrice-VirtualBox.home (lfbn-ren-1-128-3.w83-205.abo.wanadoo.fr. [83.205.212.3]) by smtp.gmail.com with ESMTPSA id q26sm4581170wmc.6.2019.03.20.13.29.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 13:29:45 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 20 Mar 2019 21:29:28 +0100 Message-Id: <20190320202928.13040-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20190320202928.13040-1-fontaine.fabrice@gmail.com> References: <20190320202928.13040-1-fontaine.fabrice@gmail.com> Subject: [Buildroot] [PATCH 2/2] package/jq: add oniguruma optional dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Fabrice Fontaine --- package/jq/jq.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/jq/jq.mk b/package/jq/jq.mk index aebe8c86e4..bf96f0cecb 100644 --- a/package/jq/jq.mk +++ b/package/jq/jq.mk @@ -17,8 +17,15 @@ 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 +JQ_CONF_OPTS += --disable-maintainer-mode HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-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))