From patchwork Mon Jul 30 06:31:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 173966 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 57E572C0088 for ; Mon, 30 Jul 2012 16:32:29 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EA1DC1016DD; Mon, 30 Jul 2012 06:32: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 pI5SOLbs8Q6i; Mon, 30 Jul 2012 06:32:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 139C9101801; Mon, 30 Jul 2012 06:32:06 +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 997928F753 for ; Mon, 30 Jul 2012 06:32:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8FB398B2C7 for ; Mon, 30 Jul 2012 06:32:02 +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 lLt4EWu+bxfI for ; Mon, 30 Jul 2012 06:31:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id 55AC18B641 for ; Mon, 30 Jul 2012 06:31:55 +0000 (UTC) Received: by mail-wi0-f181.google.com with SMTP id hm2so1146745wib.10 for ; Sun, 29 Jul 2012 23:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=GWpHoDHV6wydgIU1819OkJ/0bR6j8zB4XCCfI757y2w=; b=xB6k+9zEnt3hLlxVNe+fLjMh1PKYvHAfAH1iBAJ/11u+lDrrbT9XMa5KW66pOrive2 O87pBDo7oY8ED22LDKP1AVAsQ9I/oUZUnSCod0qznkOkNFGoEr9B9ZSbQHOp4Ycam+PE xvKoZJrguCH2lgrIW0FVG+ghZAALBc2VyB8oVTMnqsU8WzEyHM8pt4mtsuJtefacvzbZ utqw5SbSGHIJ2eeA7Uyqr9IAFwRMbqLBSzq6HPuUl+mYf4dcVl+s0r/fM0OHaSZflmjY 9ZSIjM4vrt+DTjK+EQfoH8excUwwJJuOxBQh9dIvpMhm7UbrXok8LMz91H4eOjlY0qsp B5kA== Received: by 10.180.87.232 with SMTP id bb8mr40001496wib.0.1343629914954; Sun, 29 Jul 2012 23:31:54 -0700 (PDT) Received: from xubuntu-12.04 (188.165.22.93.rev.sfr.net. [93.22.165.188]) by mx.google.com with ESMTPS id b7sm21900745wiz.9.2012.07.29.23.31.52 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 29 Jul 2012 23:31:54 -0700 (PDT) From: Francois Perrad To: buildroot@busybox.net Date: Mon, 30 Jul 2012 08:31:29 +0200 Message-Id: <1343629890-4657-3-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343629890-4657-1-git-send-email-francois.perrad@gadz.org> References: <1343629890-4657-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 3/4] lua: remove 3 sub-options, always install all 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 --- package/lua/Config.in | 18 ------------------ package/lua/lua.mk | 17 +---------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/package/lua/Config.in b/package/lua/Config.in index 06f3046..fc6bb4c 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -32,29 +32,11 @@ endchoice if BR2_PACKAGE_LUA -config BR2_PACKAGE_LUA_COMPILER - bool "lua compiler" - select BR2_PACKAGE_LUA_SHARED_LIBRARY - help - Install luac binary - -config BR2_PACKAGE_LUA_INTERPRETER - bool "lua interpreter" - select BR2_PACKAGE_LUA_SHARED_LIBRARY - help - Install lua binary - config BR2_PACKAGE_LUA_INTERPRETER_READLINE bool "readline support" - depends on BR2_PACKAGE_LUA_INTERPRETER select BR2_PACKAGE_READLINE select BR2_PACKAGE_NCURSES help Enables command-line editing in the lua interpreter. -config BR2_PACKAGE_LUA_SHARED_LIBRARY - bool "shared library" - help - Install shared liblua.so - endif diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 26c1576..136dca6 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -8,10 +8,7 @@ LUA_VERSION = 5.1.5 LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES -LUA_CFLAGS = -Wall -ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y) - LUA_CFLAGS += -fPIC -endif +LUA_CFLAGS = -Wall -fPIC LUA_MYLIBS += -ldl @@ -44,13 +41,11 @@ define HOST_LUA_BUILD_CMDS PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all endef -ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y) define LUA_INSTALL_STAGING_SHARED_LIB $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ $(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION) ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so endef -endif define LUA_INSTALL_STAGING_CMDS $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ @@ -64,29 +59,19 @@ define LUA_INSTALL_STAGING_CMDS $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h endef -ifeq ($(BR2_PACKAGE_LUA_INTERPRETER),y) define LUA_INSTALL_INTERPRETER $(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua endef -endif -ifeq ($(BR2_PACKAGE_LUA_COMPILER),y) define LUA_INSTALL_COMPILER $(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac endef -endif -ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y) define LUA_INSTALL_LIBRARY $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ $(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION) ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a -endef -else -define LUA_INSTALL_LIBRARY - $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a -endef endif ifeq ($(BR2_HAVE_DEVFILES),y)