From patchwork Wed Nov 4 07:43:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1393690 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.133; helo=hemlock.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=EevEwezG; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQzFS51jMz9sTK for ; Wed, 4 Nov 2020 18:44:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DB92287537; Wed, 4 Nov 2020 07:44:40 +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 BuSjZt0NNJ1p; Wed, 4 Nov 2020 07:44:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 52779874E3; Wed, 4 Nov 2020 07:44:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 41A4C1BF228 for ; Wed, 4 Nov 2020 07:44:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3EB2D866A9 for ; Wed, 4 Nov 2020 07:44:38 +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 CacmrdrnfanZ for ; Wed, 4 Nov 2020 07:44:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5BFDB8659F for ; Wed, 4 Nov 2020 07:44:37 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id n18so20935377wrs.5 for ; Tue, 03 Nov 2020 23:44:37 -0800 (PST) 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=jxxLw6NM+t6UfjF54d74L6b7DqpxacE7VsdO1Cm8d6g=; b=EevEwezGOmQflehsoHGFi2gDX5Wzr5jtWztGi/Kum5iGUr1250viC2zUUKlOccvpR7 5s/D3R50paszg7cJwdNgm7yP/uUeXGhexBl6LKdJh/Lf/uBVDsEEx91W8FpRPZUT6XSf ZLsGxxgb4noxhQjJP+X2CW43RfbfmAF/Kk61KHte6q2zF0dTmVo3BlkAQ1sa4POngXSF KvUofUnShVVGu43MbgXRsfbws3QE0/gpi2qHd3OFaFUx9hviG/9Cr3hS4WWFi0hoim7V PnGLUmifLIT6Eof1AXwFwFkDIXVVsJM1oDRoqvqLWy1D19By+2u1DEoUKO9LZpnF43Rm SOsw== 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=jxxLw6NM+t6UfjF54d74L6b7DqpxacE7VsdO1Cm8d6g=; b=BM42ryRqKm+WZ+c9DiJTjRFeF0INGdlgVedcoRQ/niGxaf5h1B2EjOrr+Zv0ZYSvdH PUOxWrAgwGsziu1Hox6wmQ78hvY2w2cSMNh97DpCKXy9YZvWGET3KPLa3YcoFz8VLsrp xWQPQaV24NgjlEpMlTj/Fyfdg124mxSqfZ0W9R7SSFF3eYQPiq6mPbGcsIxafQTQqDMF OpcrzAVVXW1y7wekp3LAqhpPKBnolp9OAbc9NkXFOheWuP+rOksBqmCN+ujE14gbJZMb rHhiEugg73vPvDW1k6hXuUwte9YaoQ3Ba2jjGMNjUnfweiHkCITwdHC9A8YZfLF/qRwE 5vTg== X-Gm-Message-State: AOAM530Qr2mOOyWLxWj6mqqHRjPnxKSNthw1HQweJiSjcoXMqqOE3vXd uLMXEsTxMYB8ozlkkpPtw1Dgol+On4s= X-Google-Smtp-Source: ABdhPJzRhcqjq7dyYkfHvhGI/ny8df5PUcDqfHdY1qsacTpnewQlakip4ZRdkJt5KSHqKC2ttodu3w== X-Received: by 2002:adf:f285:: with SMTP id k5mr1670434wro.299.1604475875413; Tue, 03 Nov 2020 23:44:35 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id n17sm1305106wrw.69.2020.11.03.23.44.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 23:44:34 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 4 Nov 2020 08:43:11 +0100 Message-Id: <20201104074311.491932-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/civetweb: drop BR2_PACKAGE_CIVETWEB_WITH_LUA 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: Thomas Davis , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop BR2_PACKAGE_CIVETWEB_WITH_LUA and enable Lua support depending on BR2_PACKAGE_LUA and BR2_PACKAGE_LUAJIT It should be noted that civetweb will still use its embedded version of sqlite Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 9 +++++++++ package/civetweb/Config.in | 12 ------------ package/civetweb/civetweb.mk | 20 +++++++++++++++++--- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index edb110debf..fec9ece82b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2020.11" +config BR2_PACKAGE_CIVETWEB_WITH_LUA + bool "civetweb's Lua support option removed" + select BR2_LEGACY + help + Lua support does not depend on a version of Lua bundled + within the Civetweb sources anymore. Lua support is + automatically enabled if an Lua interpreter (lua or luajit) + is enabled on buildroot. + config BR2_PACKAGE_OPENCV bool "opencv package was removed" select BR2_LEGACY diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in index 9e43969085..6bca5ed8fd 100644 --- a/package/civetweb/Config.in +++ b/package/civetweb/Config.in @@ -21,18 +21,6 @@ config BR2_PACKAGE_CIVETWEB_LIB Enable the civetweb library for embedding in another application. -config BR2_PACKAGE_CIVETWEB_WITH_LUA - bool "enable Lua support" - # required by the bundled Sqlite3 and Lua code - depends on !BR2_STATIC_LIBS - help - Enable Lua support in Civetweb. Note that this will use a - version of Lua and Sqlite bundled within the Civetweb - sources, and not the packages from Buildroot. - -comment "lua support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - endif comment "civetweb needs a toolchain w/ threads" diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index c0cbdb4a20..448f979b41 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -25,9 +25,23 @@ ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),) CIVETWEB_COPT += -DNO_ATOMICS=1 endif -ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y) -CIVETWEB_CONF_OPTS += WITH_LUA=1 -CIVETWEB_LIBS += -ldl +ifeq ($(BR2_PACKAGE_LUA),y) +CIVETWEB_CONF_OPTS += WITH_LUA=1 WITH_LUA_SHARED=1 +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs lua` +CIVETWEB_DEPENDENCIES += host-pkgconf lua +ifeq ($(BR2_PACKAGE_LUA_5_1),y) +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=501 +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=503 +else ifeq ($(BR2_PACKAGE_LUA_5_4),y) +CIVETWEB_CONF_OPTS += WITH_LUA_VERSION=504 +endif +endif + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +CIVETWEB_CONF_OPTS += WITH_LUA=1 WITH_LUAJIT_SHARED=1 +CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs luajit` +CIVETWEB_DEPENDENCIES += host-pkgconf luajit endif ifeq ($(BR2_PACKAGE_OPENSSL),y)