From patchwork Tue Sep 4 06:58:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 181504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id CD8D22C008C for ; Tue, 4 Sep 2012 16:59:34 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 85A0CA02C5; Tue, 4 Sep 2012 06:59:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MomTSSBB+1BS; Tue, 4 Sep 2012 06:59:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 13ED6A02C1; Tue, 4 Sep 2012 06:59: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 89DBB8F753 for ; Tue, 4 Sep 2012 06:59:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CD97F8AA00 for ; Tue, 4 Sep 2012 06:59:00 +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 DWWhRs35u7Ue for ; Tue, 4 Sep 2012 06:59:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id C6C328A3D7 for ; Tue, 4 Sep 2012 06:58:59 +0000 (UTC) Received: by wgbfm10 with SMTP id fm10so3707635wgb.10 for ; Mon, 03 Sep 2012 23:58:58 -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=i3yCYxnfseJuLSZYH4QIulKQvOhDcw50cxY4/GZ2YEA=; b=N0nZOYAR4NvULMQP9ShhiP7lGj+FOGbP4WCMgPvdY4Pr+sn2lLd81SZ2Hc7koiP2RL ci6kRgnJIoam1Lu0krh27w0ppLTiiV3qXdO3osItQ2v86EazmytuYMS46yBATkR3/CRX UhgbDmo3bOdzempJkGms/Zw0BX0Wb6dQQlmsYFRTauNA7qDUKBl0gE76OwpfZRWsYnXB tFU35fsrWIzTlTVCnQphDRTnTVtjYgOm7nsJKCzAIK4KBY9V8i6i2UPl2JST5y5F9wrh X/Jm4OeS7+4Cc7dFPmzQpUz/r2QhxQgyuL96giXsO6KaOunwYoVIibeK5wRguZarNkx4 Cb1A== Received: by 10.216.237.161 with SMTP id y33mr10566169weq.62.1346741937963; Mon, 03 Sep 2012 23:58:57 -0700 (PDT) Received: from xubuntu-12.04 (135.135.193.77.rev.sfr.net. [77.193.135.135]) by mx.google.com with ESMTPS id j6sm34144260wiy.4.2012.09.03.23.58.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Sep 2012 23:58:57 -0700 (PDT) From: Francois Perrad To: buildroot@busybox.net Date: Tue, 4 Sep 2012 08:58:40 +0200 Message-Id: <1346741921-28968-4-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346741921-28968-1-git-send-email-francois.perrad@gadz.org> References: <1346741921-28968-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 4/5] 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 Signed-off-by: Francois Perrad Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/lua/Config.in | 18 ------------------ package/lua/lua.mk | 18 +----------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/package/lua/Config.in b/package/lua/Config.in index ad454a6..febec45 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 de60c57..4704e4c 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -10,11 +10,7 @@ LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT LUA_LICENSE_FILES = COPYRIGHT -LUA_CFLAGS = -Wall -ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y) - LUA_CFLAGS += -fPIC -endif - +LUA_CFLAGS = -Wall -fPIC LUA_MYLIBS += -ldl ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y) @@ -46,13 +42,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 \ @@ -66,29 +60,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)