From patchwork Sat Oct 21 20:54:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 828967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FAFNHivu"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yKFKy48LHz9s7G for ; Sun, 22 Oct 2017 07:55:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 758E187B94; Sat, 21 Oct 2017 20:55:14 +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 idPg8nLAxqSe; Sat, 21 Oct 2017 20:55:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 356D887C4E; Sat, 21 Oct 2017 20:55:13 +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 C91771C41D9 for ; Sat, 21 Oct 2017 20:55:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BEE778706B for ; Sat, 21 Oct 2017 20:55:10 +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 akmrZGw1HymJ for ; Sat, 21 Oct 2017 20:55:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 814468706E for ; Sat, 21 Oct 2017 20:55:09 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id y39so13967364wrd.4 for ; Sat, 21 Oct 2017 13:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=KGaA+AILmcFZFwoFxbDWTBW3X7I35ADQHBRB2S2ROlE=; b=FAFNHivu0ojFUtjB3OZJvhufPXI0ulahh23SShl013VC5VTd7lUHeUkzKaIuBRozcz 4NVh7prCBAzTVOjc/H21LWX0Uis6mqLCDkYWPNSeBNe5lc9JHzcV/qrU0eVnqYiFcm43 F93Ljkr1YmG4LjA9lhKmDQUsJZk4qnxQo95STvqyoWavZ3YduEsA5dXn0YEsu+NAHx/F lq7+pMnqql0dKLRnwryPa4q+kt+erW/+O0Z1MJMms6yhyl7w1980sXeCPxxBPPo++ftE foc39OETM5L+DMksCfdSHNuvYvsNrGg4vqaaQ+OQwRSKbDw3unya/zKzKqTgsBEh/BaK sX4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=KGaA+AILmcFZFwoFxbDWTBW3X7I35ADQHBRB2S2ROlE=; b=hdkOvP3fRjScjjkXNPW0nLmPijJus5Kmk+b1QhM8sneAb0fo4k6my6f5YteNwVgSGv 81TfRS2MJnE4E6wRpgEaL4KGPruMvUTmMvr7kFh3uDmLmrfgLaQKLwIgpSHW8yAoNiK9 Jcu1nH/ZkPIFqigweGhZepHvkJ0WbzghyL0mWBnjljHgLdwtCBvrAZ5P32S36GIONc9j hxWpIN9v4PU+8HM3vd7wsbVg3nUehut3fnO7w0Po5w99II8ZOG26uyAevVkJMZ6azkUN FzdbswxLaLsSmeWm65/bEhUC7FGKrOgSieIBU+C4sQYZlgO43n+9TZMA+r+fqGkKLA4m IH1g== X-Gm-Message-State: AMCzsaX7+aWtNHAXmw+pMin+aGDdatIn0+4Y/TcLS19AYDhCNHfSvOY1 a/snj89EjmMLJY8QYs6y7+wMB+Yz X-Google-Smtp-Source: ABhQp+R/FbKoZYD5mzH/Cdjje+i0ZnzfHgPwUUXcqPvryGzi/kEp4sfLEwVw7BYDaJZmIjKZrGKiPQ== X-Received: by 10.223.186.12 with SMTP id o12mr5557310wrg.1.1508619307670; Sat, 21 Oct 2017 13:55:07 -0700 (PDT) Received: from dell.be.48ers.dk (nat.sh.cvut.cz. [213.195.201.2]) by smtp.gmail.com with ESMTPSA id r29sm737408wra.71.2017.10.21.13.55.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Oct 2017 13:55:06 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.89) (envelope-from ) id 1e60nR-0004sp-OQ; Sat, 21 Oct 2017 22:55:05 +0200 From: Peter Korsgaard To: buildroot@buildroot.org, fperrad@gmail.com Date: Sat, 21 Oct 2017 22:54:57 +0200 Message-Id: <20171021205457.18687-1-peter@korsgaard.com> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [RFC] lua: always use host-lua for host-luainterpreter X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Similar to how we do for openssl. host-luainterpreter is only used by the luarocks infrastructure, and there is afaik no specific reason why the host lua variant must match the target one. Luajit only supports a limited number of architectures, so building it for the host limits the architectures Buildroot can be used on (E.G. powerpc64 autobuilders). To fix this, always use host-lua. Slightly rework lua.mk to ensure host-lua-5.1 is used when luajit is selected, and drop the logic for using host-luajit. Signed-off-by: Peter Korsgaard --- package/lua/lua.mk | 6 +++--- package/luainterpreter/Config.in | 4 ++++ package/luainterpreter/luainterpreter.mk | 2 +- package/luarocks/luarocks.mk | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 0ac2e0e25d..851dc8f734 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -16,10 +16,10 @@ endif LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -LUA_LICENSE_FILES = COPYRIGHT -else +ifeq ($(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUA_5_3),y) LUA_LICENSE_FILES = doc/readme.html +else +LUA_LICENSE_FILES = COPYRIGHT endif LUA_PROVIDES = luainterpreter diff --git a/package/luainterpreter/Config.in b/package/luainterpreter/Config.in index e89a9b84d2..7bc54d862f 100644 --- a/package/luainterpreter/Config.in +++ b/package/luainterpreter/Config.in @@ -7,3 +7,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION string + +config BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER + string + default "host-lua" diff --git a/package/luainterpreter/luainterpreter.mk b/package/luainterpreter/luainterpreter.mk index cb1d5dde18..58d421b183 100644 --- a/package/luainterpreter/luainterpreter.mk +++ b/package/luainterpreter/luainterpreter.mk @@ -20,4 +20,4 @@ endif $(eval $(virtual-package)) $(eval $(host-virtual-package)) -LUA_RUN = $(HOST_DIR)/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER)) +LUA_RUN = $(HOST_DIR)/bin/lua diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index e050cb553c..ea57530633 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -23,10 +23,6 @@ HOST_LUAROCKS_CONF_OPTS = \ --sysconfdir=$(LUAROCKS_CONFIG_DIR) \ --with-lua=$(HOST_DIR) -ifeq ($(BR2_PACKAGE_LUAJIT),y) -HOST_LUAROCKS_CONF_OPTS += --lua-suffix=jit -endif - define HOST_LUAROCKS_CONFIGURE_CMDS cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS) endef