From patchwork Tue Jun 23 18:35:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Bres X-Patchwork-Id: 1315425 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.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.a=rsa-sha256 header.s=20161025 header.b=Ojo5p+3x; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49rw366jvJz9sRN for ; Wed, 24 Jun 2020 04:36:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6FF5B8697D; Tue, 23 Jun 2020 18:36:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y3FZPZzKGEN2; Tue, 23 Jun 2020 18:36:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4D6BD88FA6; Tue, 23 Jun 2020 18:36:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4ABBD1BF28B for ; Tue, 23 Jun 2020 18:36:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4752288FA6 for ; Tue, 23 Jun 2020 18:36:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YA8A+MeRPEGZ for ; Tue, 23 Jun 2020 18:36:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 743878697D for ; Tue, 23 Jun 2020 18:36:14 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id g21so4318079wmg.0 for ; Tue, 23 Jun 2020 11:36:14 -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:mime-version :content-transfer-encoding; bh=DpjR5GDwqSJybU8LnPFt2kIVpZcHZu+UzykfJsUDQ5g=; b=Ojo5p+3xO2UsltrVAKy9izs77G8L4T1kzu4ervi1c/W6HSYE36IeqHB03CQXdVHJm7 Q/I9dheGwuPRMppc0CvYCqG9U457tNOBruO7TeXN26qu/JsN7DnbXPKM9JI++5W5XCaO 8w/d/8RyZ/33XGRH5/i0PIWbeZYLho/YtXgUsaAkQ7b1jSwNv0Ni1xTWcZKb4wblmp/2 bJJOLdh8d0HTHu9mYFMSDPRN/skWfP2GV0MjR9TJ69b8hmQR01oNaMV5XSi8dp4QWfmb Ga9u6x1ZpCFvzf6n4gxHKScSulEMYHyuodmmNPQNSgamV7p5VVWl96D5uw1kG4AAF+h0 Xn3A== 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:mime-version :content-transfer-encoding; bh=DpjR5GDwqSJybU8LnPFt2kIVpZcHZu+UzykfJsUDQ5g=; b=K+FGPORcjzSfTSXGS8sn4rfbmLaplVU61YsNQYgBoJ3ciLOgzAh5eAsiaXecRjlABE Qzbbe+X0CEG+W4daMimZ7pLI0UlQetMXsPk6r5Ky7rBNXy0JodaYc/vulNX2bV4m5/D8 zLeFrUjP28lL6DJdtbUmD8Siau5TSctwn62lv3caeOqNJPckR1399PMhWHtxscYSB4SS 0aSGEvhYgO2U2aYvVayi/OJM+2eHE2rkmg3aZmbNSPzoAZJOj8wXWwVZ/WIKLErzRF8V BG+X2dHDtYCn8Oa0XBEGSs1NjYxa5XLwgYlDf1UW1sqe/9m+Np/nMD1iMJQ0jI7uZGMm Zc6w== X-Gm-Message-State: AOAM530R59J3A/d+aG+v3WzHT/NIRUxQ6mxZk3sI96AxfM6HgKu1WkoT OwuqAQsnLG5wZbfV9wQ+8CZ4LvHi X-Google-Smtp-Source: ABdhPJw3oB57LB0oC1fZRHoWBeu/dVBAbkFoRO4Z2A1baTXExDe9GMAvw1FCBZiA44dIffqFpiijYQ== X-Received: by 2002:a7b:c746:: with SMTP id w6mr11070079wmk.171.1592937372532; Tue, 23 Jun 2020 11:36:12 -0700 (PDT) Received: from lenovoX201.home ([2a01:cb1c:794:2300:8ea9:82ff:fe03:6fc]) by smtp.gmail.com with ESMTPSA id d9sm23399835wre.28.2020.06.23.11.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 11:36:12 -0700 (PDT) From: "Guillaume W. Bres" To: buildroot@busybox.net Date: Tue, 23 Jun 2020 20:35:49 +0200 Message-Id: <20200623183549.12105-1-guillaume.bressaix@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libnids: disable libglib2 only if not available 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: "Guillaume W. Bres" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Take advantage of a possibly existing BR2_PACKAGE_LIBGLIB2 Signed-off-by: Guillaume W. Bres --- package/libnids/libnids.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk index ee7c71ee88..83719a712f 100644 --- a/package/libnids/libnids.mk +++ b/package/libnids/libnids.mk @@ -12,8 +12,13 @@ LIBNIDS_INSTALL_STAGING = YES LIBNIDS_DEPENDENCIES = host-pkgconf libpcap LIBNIDS_AUTORECONF = YES LIBNIDS_CONF_OPTS = \ - --disable-libglib \ --disable-libnet + +# disable libglib2 if not available +ifeq ($(BR2_PACKAGE_LIBGLIB2),n) +LIBNIDS_CONF_OPTS += --disable-libglib +endif + # hand-written Makefile.in, not using automake, needs a custom # variable for the installation path. LIBNIDS_INSTALL_STAGING_OPTS = install_prefix=$(STAGING_DIR) install