From patchwork Tue Sep 25 23:29:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Faith X-Patchwork-Id: 974782 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=impinj.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=impinj.com header.i=@impinj.com header.b="RRx7dGcd"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42KhXQ0KpQz9rxp for ; Wed, 26 Sep 2018 12:21:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B6C3D220C1; Wed, 26 Sep 2018 02:21:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O709rOizSZcl; Wed, 26 Sep 2018 02:21:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2C47021571; Wed, 26 Sep 2018 02:21:52 +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 59D101C2135 for ; Wed, 26 Sep 2018 02:21:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 568A284097 for ; Wed, 26 Sep 2018 02:21:51 +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 3NUNZ6gLbnCu for ; Wed, 26 Sep 2018 02:21:49 +0000 (UTC) X-Greylist: delayed 00:18:58 by SQLgrey-1.7.6 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680139.outbound.protection.outlook.com [40.107.68.139]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3BC7B83E2B for ; Wed, 26 Sep 2018 02:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=impinj.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dI4DMhl+BURz3ejTVioDgTnyJmcU2ClLZ4O81ei852o=; b=RRx7dGcdyvM/DpvYXt3go9HC7UOYKALtiS1CswUioc4BBUdNJFrTszhJZzn/GJIg326Ii1n/mUl4ART3L1p534HX1f27LAzYXXasl1Yygk5sTTQ2WJLYRFr6lO9DdR8ADj1l6vZSX05g7FO4xXX5NKeGqIyJbCWoc9r7GoY/Dhw= Received: from DM2PR0601MB1229.namprd06.prod.outlook.com (10.160.220.19) by DM2PR0601MB1134.namprd06.prod.outlook.com (10.160.218.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Tue, 25 Sep 2018 23:29:42 +0000 Received: from DM2PR0601MB1229.namprd06.prod.outlook.com ([fe80::9c5f:a3a7:fcce:9ca0]) by DM2PR0601MB1229.namprd06.prod.outlook.com ([fe80::9c5f:a3a7:fcce:9ca0%5]) with mapi id 15.20.1164.024; Tue, 25 Sep 2018 23:29:42 +0000 From: John Faith To: "buildroot@buildroot.org" Thread-Topic: [PATCH 1/1] civetweb: bump version to 1.11 Thread-Index: AQHUVSeiTiQNMoxLA0yPuWsLzOsSMg== Date: Tue, 25 Sep 2018 23:29:42 +0000 Message-ID: <20180925232917.24591-1-jfaith@impinj.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: CY4PR21CA0043.namprd21.prod.outlook.com (2603:10b6:903:12b::29) To DM2PR0601MB1229.namprd06.prod.outlook.com (2a01:111:e400:5022::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jfaith@impinj.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [216.207.205.253] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM2PR0601MB1134; 6:aoOlrSSjkaHtIVP8UV/V6tMlp2L9ip7n5Qn3SK5+gixYxFboWW24sr5O5VtixkZye7nsewVDt0zKHG4e2GCBoUr1QhZQFaKE+suYBr1YsJaoH445feMUyEdW/ZoeVJMbvRDZtkG0S38T5yXrO/G2VWMUI/BXOmilLwAIREetDYRQgymivEYAP681nui2w99CQSMipFJDXvc/qmuAi8KEFy588S3II2xYl0DTjMTTc2wII8JtSSRjHePYBd0ecHo16FfzAQ7qeiL4aQxp4MBc0BUhoJRtN5Z7zV2waIdAZ9TgqNraU8okGtEWQyHmsXFDf+k9mb2x2yB5HCoyaC515kB7sW8mGZX1p5pAsqpcc1TYti5Lo8QLzpY7R1cc21HL4nu5Nz6Gvw77jQA95JO7BSd0d42IOqGwAchv+GNpuVaFHcAh9c1KZJon1L9pyoS/mSTiuLgbKPvCq+syupIEnA==; 5:ahbjLU7DydqNOhg43ipSs236jd/R+W0FfA+m0/YMEb4g252rNE+8DR4l2+6oRXJg62LyKU8qfs9S7WUT7fJQYObBA98o5Yku6iY8Ss3A8mQC0JY3w/hAIDHV/Pbx3pNh0/3SkHZnLMzVnv1w+tj9B5fSmhXPUr6CqfbJgGAXH7k=; 7:wrQGnVSMQVB4WGHsGpIt/1PEt4k8OIVvCmMFcJJ2v1U0/o92VYLAgGgYIuaO3JSXc7ieCam2rzSGSK8O5bAiLhTdJdzzup8n3Nu5UZXsAINf7KLuVQKWzM391/pILDR/Sb7QGMD/1Jsf6uIPc6n1ENToYUrV7gpOQuUK0pCgJjUxhrqu0cEEnUPwPpXgNK9GZYIDUkbt7bywM1XdApO1Ke6927rOnWb82FurHVIFvgcQ5enfBPv6s8uyKOG+p6U9 x-ms-office365-filtering-correlation-id: 164a7d88-b444-4610-933b-08d6233ec444 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:DM2PR0601MB1134; X-MS-TrafficTypeDiagnostic: DM2PR0601MB1134:|DM2PR0601MB1134: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(265273979862326)(158342451672863)(278428928389397); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(93006095)(93001095)(10201501046)(149066)(150027)(6041310)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(201708071742011)(7699051); SRVR:DM2PR0601MB1134; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0601MB1134; x-forefront-prvs: 08062C429B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(346002)(136003)(396003)(366004)(39850400004)(199004)(189003)(52116002)(316002)(6436002)(25786009)(68736007)(54906003)(6486002)(6116002)(575784001)(86362001)(2616005)(102836004)(476003)(99286004)(186003)(3846002)(36756003)(486006)(1076002)(26005)(105586002)(106356001)(6916009)(2906002)(2351001)(8676002)(66066001)(81166006)(5250100002)(1730700003)(5660300001)(81156014)(97736004)(71190400001)(71200400001)(14454004)(8936002)(14444005)(256004)(2900100001)(2501003)(305945005)(7736002)(53936002)(107886003)(386003)(6512007)(478600001)(6506007)(34290500001)(4326008)(5640700003); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0601MB1134; H:DM2PR0601MB1229.namprd06.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: impinj.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: lPaGcLcJQR6kqo0JgWxDSTo5CRqHJieoZKSPe+3Nnh5R9UgLGeq9a/7JkOK+F2ZdWIG/yFQN40KNV0IiPQrUmXL6XaR5WRcn2DTTjKBZgVxBWPAqUDOOqFEyrQqBkNCLdQ2SdZH6rP6mu/i82xmzKmXfJb9Si8hQopu+Ah0veRzDhqD+7ouP9Hr12CjxVLE09HujkcvZXcvvp4Ub5jMxKOOqdldk4fuUm5sALCZzfwcBiqnGldOhWklkS/72zlJJ3lOjt419oDUxtbok+kie5fiYN5ZnFtj2j9lX/89+NFGI1eqHjDsEzoAwZ6nEKTmoiofNRWeZesnXt2XtGEB8ADpM8Q2i9y9BQUKFRGElnI4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 164a7d88-b444-4610-933b-08d6233ec444 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Sep 2018 23:29:42.4042 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 6de70f0f-7357-4529-a415-d8cbb7e93e5e X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0601MB1134 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0601MB1134; 23:3iVA/OMlpO8wdqLVkObvm6S2TTn28dxHxVTOL3CPXv8CpMK06Wosm9pXdqp6upz72jF4Z40ohLIAXosUKD8uUCOZoYhglvl37Jm4MC217G2wB0+gMotrKcDDRvg5WTDb6y5fxWAJaXT0lwBNZ4pWbg== X-OriginatorOrg: impinj.com Subject: [Buildroot] [PATCH 1/1] civetweb: bump version to 1.11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Davis , John Faith Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" v1.11 now has library and header install targets for use by apps that serve pages. The config changes allow enabling the civetweb webserver app binary and/or libs and headers. If the civetweb lib is enabled, the static lib will always be built and if BR2_STATIC_LIBS is not on, also build the shared object. The C++ interface option is automatic based on available C++ support. If both the library and server options are disabled, don't do a target install. The civetweb Makefile sets -fPIC in CFLAGS when linking shared objects, but not when compiling the objects used in the library resulting in a link failure, so add -fPIC to COPT which is added to CFLAGS in its Makefile. The typo patch has already been incorporated upstream, so it was removed. Signed-off-by: John Faith --- ...ua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch | 27 ----------------- package/civetweb/Config.in | 25 +++++++++++++++- package/civetweb/civetweb.hash | 2 +- package/civetweb/civetweb.mk | 34 +++++++++++++++++++--- 4 files changed, 55 insertions(+), 33 deletions(-) delete mode 100644 package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch diff --git a/package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch b/package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch deleted file mode 100644 index aee3cfcbff..0000000000 --- a/package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0821066f9adf8410891cd07684ecac50a9bc36a4 Mon Sep 17 00:00:00 2001 -From: Fabio Porcedda -Date: Wed, 25 Feb 2015 18:40:24 +0100 -Subject: [PATCH] Lua: fix a typo changing %(LFS_DIR) to $(LFS_DIR) - -Also this fix a error on GNU Make v4.0: - Makefile:203: *** mixed implicit and normal rules. Stop. - -Signed-off-by: Fabio Porcedda ---- - resources/Makefile.in-lua | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/resources/Makefile.in-lua b/resources/Makefile.in-lua -index 0902f11..f3d95fd 100644 ---- a/resources/Makefile.in-lua -+++ b/resources/Makefile.in-lua -@@ -57,5 +57,5 @@ LFS_CFLAGS = -I$(LFS_DIR) - - OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS) - CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM --SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) %(LFS_DIR) -+SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) $(LFS_DIR) - --- -2.3.0 - diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in index d68a1ffd53..a1343caeb9 100644 --- a/package/civetweb/Config.in +++ b/package/civetweb/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_CIVETWEB +menuconfig BR2_PACKAGE_CIVETWEB bool "civetweb" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() @@ -9,6 +9,11 @@ config BR2_PACKAGE_CIVETWEB if BR2_PACKAGE_CIVETWEB +config BR2_PACKAGE_CIVETWEB_SERVER + bool "enable the web server application" + help + Include the web server and its config files. + config BR2_PACKAGE_CIVETWEB_WITH_LUA bool "enable Lua support" # required by the bundled Sqlite3 and Lua code @@ -19,7 +24,25 @@ config BR2_PACKAGE_CIVETWEB_WITH_LUA sources, and not the packages from Buildroot. comment "lua support needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_CIVETWEB_WITH_LUA + depends on BR2_STATIC_LIBS + +config BR2_PACKAGE_CIVETWEB_LIB + bool "enable library for embedding" + + select BR2_PACKAGE_CIVETWEB_SHARED_LIB if !BR2_STATIC_LIBS + +if BR2_PACKAGE_CIVETWEB_LIB +config BR2_PACKAGE_CIVETWEB_SHARED_LIB + bool + depends on !BR2_STATIC_LIBS + help + Enable the shared library for embedding civetweb in + applications + +comment "shared library support unavailble" depends on BR2_STATIC_LIBS +endif endif diff --git a/package/civetweb/civetweb.hash b/package/civetweb/civetweb.hash index 745f4a8ce6..b3cbaad71d 100644 --- a/package/civetweb/civetweb.hash +++ b/package/civetweb/civetweb.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 79a852a26068eb6d2f8de5ee72e021f0d2c8bd176eb81f41909a876b736815d9 civetweb-v1.5.tar.gz +sha256 de7d5e7a2d9551d325898c71e41d437d5f7b51e754b242af897f7be96e713a42 civetweb-v1.11.tar.gz diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index d29765b87d..742a0ad8e3 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -4,12 +4,13 @@ # ################################################################################ -CIVETWEB_VERSION = v1.5 -CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION)) +CIVETWEB_VERSION = v1.11 +CIVETWEB_SITE = $(call github,civetweb,civetweb,$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md -CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 +CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \ + $(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1) CIVETWEB_COPT = -DHAVE_POSIX_FALLOCATE=0 CIVETWEB_LIBS = -lpthread -lm CIVETWEB_SYSCONFDIR = /etc @@ -34,8 +35,32 @@ define CIVETWEB_BUILD_CMDS COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)" endef +ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) +CIVETWEB_INSTALL_STAGING = YES +CIVETWEB_STAGING_INSTALL_TARGETS = install-headers install-lib +ifeq ($(BR2_PACKAGE_CIVETWEB_SHARED_LIB),y) +CIVETWEB_STAGING_INSTALL_TARGETS += install-slib +CIVETWEB_COPT += -fPIC +endif +define CIVETWEB_INSTALL_STAGING_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_STAGING_INSTALL_TARGETS) \ + DESTDIR=$(STAGING_DIR) \ + PREFIX="/usr" \ + $(CIVETWEB_CONF_OPTS) \ + COPT='$(CIVETWEB_COPT)' +endef +endif + +ifeq ($(BR2_PACKAGE_CIVETWEB_SERVER),y) +CIVETWEB_INSTALL_TARGETS = install +endif +ifeq ($(BR2_PACKAGE_CIVETWEB_SHARED_LIB),y) +CIVETWEB_INSTALL_TARGETS += install-slib +endif + +ifneq ($(CIVETWEB_INSTALL_TARGETS),) define CIVETWEB_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_INSTALL_TARGETS) \ DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \ CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \ HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \ @@ -44,5 +69,6 @@ define CIVETWEB_INSTALL_TARGET_CMDS $(CIVETWEB_CONF_OPTS) \ COPT='$(CIVETWEB_COPT)' endef +endif $(eval $(generic-package))