From patchwork Mon May 25 00:48:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1297030 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.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.a=rsa-sha256 header.s=20161025 header.b=qmzwB1wZ; 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 49VdlR1bcsz9sRW for ; Mon, 25 May 2020 10:49:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C74EA8634C; Mon, 25 May 2020 00:49:18 +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 poHohbhtawBV; Mon, 25 May 2020 00:49:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1C524862B4; Mon, 25 May 2020 00:49:16 +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 018371BF380 for ; Mon, 25 May 2020 00:49:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F211A87E6F for ; Mon, 25 May 2020 00:49:13 +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 5UxM20wkyYAl for ; Mon, 25 May 2020 00:49:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5388A87E6E for ; Mon, 25 May 2020 00:49:13 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id d5so7666489ios.9 for ; Sun, 24 May 2020 17:49:13 -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 :mime-version:content-transfer-encoding; bh=6vibfEjWRRKOc8ylgYxK0UrjB9TDUeJLgHZ3923V2tc=; b=qmzwB1wZ06edtsRYfnXQQcdxep8j/pTVyFBXitzMziW+Kn7IBRKud1ei1hxBvmbhzl kfy5Z+s1HMvs1aZ2EFyevu4IxEBM3gJLDqXhd9Yo8J61vpBtmNgWIUUnIpkOaf5vhlu7 I3Xa23r6ZDx0VuITIS6pekHnSqyj8j61tBYS/Cr9XLRIU43uyhN/ZCHhPsSKWcWr5Te6 zlejFnGMf/y8wFYTtSZOeHXR+1wS2VoK+8HNjmhjtQrZdBqRNl+8PtXgdi8WqcHjOsHu ClpJ4EGIUppsaNGJOpD3DXY2hD3vrv0nEWRDv1cZU0iAqTvyiM/qxDa1y9M0Rba1LKbT vWEg== 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:mime-version:content-transfer-encoding; bh=6vibfEjWRRKOc8ylgYxK0UrjB9TDUeJLgHZ3923V2tc=; b=UIO1dwTJAgCNylN8oee3fNRAFda5MUBC/Jm3+JvuKJS/xeJ9j7K0OtB7jJVA8xwI17 lAPdJogt7qE/mGkIxL8uj4u16aXkePVH45X69wMRcfxCeXJIXlKTEt3M0QEjWAgXaOFs kn8HUPLVQ8GI7UIT606myKZXoTN6GmKaKMfROXr5aCMeJQC+739YHxaTc0nENMqyiWhY lYNZdqBA/Z2sMMkOc7Hv2zXM1fHGYBnBx7OVCRKkRatn7cZo8G65cqDgqPtlSDQuJY30 nNrGYS+2mRq2CemIapRAx73YbKIFpUP16jVug3o4xjd+GxqVVNJ3/MaKpRawzyfHfEPb VyTQ== X-Gm-Message-State: AOAM530sMTbjc+zSrbprlU9hTendzShG9Dk7yorJ+do98QAd6gPPdFdP z2lLgBMxr29xPB8Z/noAv4HMkdlt2WQ= X-Google-Smtp-Source: ABdhPJx2VzKQBCeu0RsVQn1eLFp2zhhRGNP96VFhGa51nVGq7FC4pYsnNpTK7GSs4bWVhUH719Y0hw== X-Received: by 2002:a05:6602:2f0a:: with SMTP id q10mr11418607iow.134.1590367752217; Sun, 24 May 2020 17:49:12 -0700 (PDT) Received: from james-x399.localdomain (71-218-100-23.hlrn.qwest.net. [71.218.100.23]) by smtp.gmail.com with ESMTPSA id b73sm2585520iof.13.2020.05.24.17.49.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2020 17:49:11 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sun, 24 May 2020 18:48:38 -0600 Message-Id: <20200525004845.3019642-2-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200525004845.3019642-1-james.hilliard1@gmail.com> References: <20200525004845.3019642-1-james.hilliard1@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 2/9] package/sysdig: depend on lua ABI version 5.1 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: Assaf Inbal , James Hilliard , Asaf Kahlon , Angelo Compagnucci , Romain Naour , Dushara Jayasinghe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since sysdig is compatible with lua interpreters that provide the version 5.1 ABI we should depend on that instead of unconditionally selecting luajit. Signed-off-by: James Hilliard --- package/sysdig/Config.in | 9 ++++----- package/sysdig/sysdig.mk | 8 +++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in index 0a1b3f8935..51d031e85b 100644 --- a/package/sysdig/Config.in +++ b/package/sysdig/Config.in @@ -2,9 +2,9 @@ config BR2_PACKAGE_SYSDIG bool "sysdig" depends on BR2_LINUX_KERNEL depends on BR2_INSTALL_LIBSTDCPP # libjson - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on !BR2_STATIC_LIBS # luajit, elfutils + depends on !BR2_STATIC_LIBS # elfutils depends on BR2_USE_WCHAR # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils select BR2_PACKAGE_ELFUTILS @@ -12,7 +12,6 @@ config BR2_PACKAGE_SYSDIG select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBB64 select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LUAJIT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB @@ -25,8 +24,8 @@ config BR2_PACKAGE_SYSDIG https://github.com/draios/sysdig/wiki -comment "sysdig needs a glibc or uclibc toolchain w/ C++, gcc >= 4.8, dynamic library and a Linux kernel to be built" +comment "sysdig needs a glibc or uclibc toolchain w/ C++, luajit or lua 5.1, gcc >= 4.8, dynamic library, and a Linux kernel to be built" depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 diff --git a/package/sysdig/sysdig.mk b/package/sysdig/sysdig.mk index c604032cf4..c118b422f0 100644 --- a/package/sysdig/sysdig.mk +++ b/package/sysdig/sysdig.mk @@ -9,9 +9,15 @@ SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) SYSDIG_LICENSE = GPL-2.0 SYSDIG_LICENSE_FILES = COPYING SYSDIG_CONF_OPTS = -DENABLE_DKMS=OFF -DUSE_BUNDLED_DEPS=OFF -SYSDIG_DEPENDENCIES = zlib luajit jsoncpp libcurl ncurses openssl jq libb64 elfutils +SYSDIG_DEPENDENCIES = zlib jsoncpp libcurl ncurses openssl jq libb64 elfutils SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO +ifeq ($(BR2_PACKAGE_LUA),y) +SYSDIG_DEPENDENCIES += lua +else ifeq ($(BR2_PACKAGE_LUAJIT),y) +SYSDIG_DEPENDENCIES += luajit +endif + # sysdig creates the module Makefile from a template, which contains a # single place-holder, KBUILD_FLAGS, wich is only replaced with two # things: