From patchwork Sun Mar 18 12:28:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 887377 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=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.b="AtORSWLN"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 403z4z6YPQz9sTD for ; Sun, 18 Mar 2018 23:28:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C3D7022EC0; Sun, 18 Mar 2018 12:28:32 +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 Z4nNksY6pWkl; Sun, 18 Mar 2018 12:28:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 96EA922E53; Sun, 18 Mar 2018 12:28:31 +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 7316D1C2BAC for ; Sun, 18 Mar 2018 12:28:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6FED487798 for ; Sun, 18 Mar 2018 12:28:30 +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 ItuR5EV8QC-9 for ; Sun, 18 Mar 2018 12:28:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 22A9C8792A for ; Sun, 18 Mar 2018 12:28:29 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id z73so11612467wrb.0 for ; Sun, 18 Mar 2018 05:28:29 -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; bh=ZGeyVhwPZGScNRqS0S8/RyfYDVH+3kg7yF/uz85UWFM=; b=AtORSWLNDyZxoqTG7C4PniRYtFYFzenWy2tQ6JckKH7tRyGFWyyShy/O45RF3C394l RDKv3AobkbByaSe1p6mHFrDXpRYzuSUA2RfVkXHk1oZBVhxRvhxEIfhz1x1kZMCLCOZl iGP9eQJKpLVroklFYll9OKlF7QA3LzGYMwByy6nG+fFQU/AViCDQBbCQ0+b6Z7GofhL7 OYepPtyfLViXdc+ha4A/VvAaJUo0WCkmaxaYCwaibGCuAKYWSSG2FbjdApqeSubgNHB2 Qn+cgy3ILpWtn5ByK/06vbkWlCQL6za5xXfuQLgiy+VSGClCv4Y8S6XBfhzbUV1VEpDl ebCA== 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; bh=ZGeyVhwPZGScNRqS0S8/RyfYDVH+3kg7yF/uz85UWFM=; b=PPU0dqooPC7EeJl0SXydM5wGZdqUAKoRmN3WUJJs/GrjoEb43l0gIovk9MMmWTbKVE zC7giLdekqb20mEuN2wwL89WDN1CFDdmOaoCmY/sICXKCxQzkhNX+eqFPG9jG6mPLcp1 PoB+RmL71vALwWxSfR60cPgEh356Cmf/bxwWuFN5Dx70f79b+0HypVHk5CluzN2Kxacm 84WnELaepFKf0z2Pi0IbHAUfnvCEQkZDuu8dm3E25YhEbSY6Ig/KFoky3kll9wuYThwM 6PUyPTWAYqPo7jaViBxRF4NBqozxz9pmwvTEuhkBlXHoiv55GgB7ebO4dMryflXBe9k1 TUeA== X-Gm-Message-State: AElRT7Himmeb2fnWFg30eYiEMivS/gToS+qDJggTVAtAw8RQtid8Embz 8svq5rP1/5nZdLdlbn0LHMu2GQ== X-Google-Smtp-Source: AG47ELtMJZCFrrHUJlDje4y4OByKRND+f1/f56ljvDEuJU3YS0laCE6nGtOhRaPqv+JIqvGRdN9Xig== X-Received: by 10.223.160.78 with SMTP id l14mr6103674wrl.153.1521376107382; Sun, 18 Mar 2018 05:28:27 -0700 (PDT) Received: from localhost.localdomain (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id 4sm8549790wmz.31.2018.03.18.05.28.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 05:28:26 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Sun, 18 Mar 2018 13:28:06 +0100 Message-Id: <20180318122808.4291-1-francois.perrad@gadz.org> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [Resend V4 1/3] prosody: bump to version 0.10.0 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" this version is not restricted to Lua 5.1 Signed-off-by: Francois Perrad --- package/prosody/Config.in | 4 ++-- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 20 +++++++++----------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/package/prosody/Config.in b/package/prosody/Config.in index 77eeb85ab..1bc79b7f2 100644 --- a/package/prosody/Config.in +++ b/package/prosody/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PROSODY bool "prosody" - depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT + depends on BR2_PACKAGE_HAS_LUAINTERPRETER select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime @@ -15,4 +15,4 @@ config BR2_PACKAGE_PROSODY https://prosody.im comment "prosody needs the lua interpreter" - depends on !BR2_PACKAGE_LUA_5_1 && !BR2_PACKAGE_LUAJIT + depends on !BR2_PACKAGE_HAS_LUAINTERPRETER diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 38942ea7f..d56099456 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,5 +1,5 @@ # Hashes from: https://prosody.im/downloads/source/{MD5,SHA1,SHA256,SHA512}SUMS -md5 d743adea6cfbaacc3a24cc0c3928bb1b prosody-0.9.12.tar.gz -sha1 1ee224263a5b3d67960e12edbbe6b2f16b95d147 prosody-0.9.12.tar.gz -sha256 1a59a322b71928a21985522aa00d0eab3552208d7bf9ecb318542a1b2fee3e8d prosody-0.9.12.tar.gz -sha512 e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76 prosody-0.9.12.tar.gz +md5 0eebf7a18ce1fc7dd9954c94ebd85f54 prosody-0.10.0.tar.gz +sha1 57c1c5a665e6453bdde06727ef398cd69accd9d7 prosody-0.10.0.tar.gz +sha256 7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498 prosody-0.10.0.tar.gz +sha512 ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9 prosody-0.10.0.tar.gz diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index d19653503..3ff891909 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,29 +4,27 @@ # ################################################################################ -PROSODY_VERSION = 0.9.12 +PROSODY_VERSION = 0.10.0 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING -PROSODY_DEPENDENCIES = openssl libidn - -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -PROSODY_DEPENDENCIES += lua -endif - -ifeq ($(BR2_PACKAGE_LUAJIT),y) -PROSODY_DEPENDENCIES += luajit -endif +PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl PROSODY_CONF_OPTS = \ + --with-lua-bin=$(HOST_DIR)/usr/bin \ --with-lua=$(STAGING_DIR)/usr \ + --lua-version=$(LUAINTERPRETER_ABIVER) \ --c-compiler=$(TARGET_CC) \ - --cflags="$(TARGET_CFLAGS) -fPIC" \ + --cflags="$(TARGET_CFLAGS) -fPIC -std=c99" \ --linker=$(TARGET_CC) \ --ldflags="$(TARGET_LDFLAGS) -shared" \ --sysconfdir=/etc/prosody \ --prefix=/usr +ifeq ($(BR2_PACKAGE_LUAJIT),y) +PROSODY_CONF_OPTS += --runwith=luajit +endif + define PROSODY_CONFIGURE_CMDS cd $(@D) && \ $(TARGET_CONFIGURE_OPTS) \