From patchwork Wed Apr 30 22:45:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagaert Johan X-Patchwork-Id: 344366 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 00FBD140109 for ; Thu, 1 May 2014 08:45:28 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 358338B935; Wed, 30 Apr 2014 22:45:28 +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 Iji26DGIeYIX; Wed, 30 Apr 2014 22:45:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 58C0E8B945; Wed, 30 Apr 2014 22:45:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8C1C91C1E96 for ; Wed, 30 Apr 2014 22:45:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 87C2E8B709 for ; Wed, 30 Apr 2014 22:45:22 +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 A2ULleYnTsnA for ; Wed, 30 Apr 2014 22:45:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailrelay007.isp.belgacom.be (mailrelay007.isp.belgacom.be [195.238.6.173]) by whitealder.osuosl.org (Postfix) with ESMTP id 58F548B657 for ; Wed, 30 Apr 2014 22:45:17 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ao0GAH18YVNtgicP/2dsb2JhbABZgwZPxSOBIBd0gwIjT0s3iEUBCMoVjlEdhCMEmSeBPJEvgzM7 Received: from 15.39-130-109.adsl-dyn.isp.belgacom.be (HELO debian605.apex) ([109.130.39.15]) by relay.skynet.be with ESMTP; 01 May 2014 00:45:16 +0200 From: Sagaert Johan To: buildroot@busybox.net Date: Thu, 1 May 2014 00:45:00 +0200 Message-Id: <1398897900-31163-1-git-send-email-sagaert.johan@skynet.be> X-Mailer: git-send-email 1.9.2 Cc: Sagaert Johan Subject: [Buildroot] [PATCH 1/1 v2] libwebsockets : bump version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net bump to v1.23-chrome32-firefox24 The latest releases use the cmake build infrastructure. Converted the makefile to the cmake infrastructure. The autotools infrastructure is no longer supported. Signed-off-by: Sagaert Johan --- v2 :added comment on the removed autotools support. package/libwebsockets/libwebsockets.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index ec5244c..1d76bc9 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,14 +4,18 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = v1.22-chrome26-firefox18 +LIBWEBSOCKETS_VERSION = v1.23-chrome32-firefox24 LIBWEBSOCKETS_SOURCE = libwebsockets-$(LIBWEBSOCKETS_VERSION).tar.xz LIBWEBSOCKETS_SITE = http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot LIBWEBSOCKETS_LICENSE = LGPLv2.1 LIBWEBSOCKETS_LICENSE_FILES = COPYING LIBWEBSOCKETS_DEPENDENCIES = zlib -LIBWEBSOCKETS_AUTORECONF = YES -LIBWEBSOCKETS_CONF_OPT = --without-testapps LIBWEBSOCKETS_INSTALL_STAGING = YES -$(eval $(autotools-package)) +LIBWEBSOCKETS_CONF_OPT += -DWITHOUT_TESTAPPS=ON + +ifeq ($(BR2_PACKAGE_OPENSSL),) + LIBWEBSOCKETS_CONF_OPT += -DWITH_SSL=OFF +endif + +$(eval $(cmake-package))