* [Buildroot] [lua v2 0/4] lua
@ 2014-02-26 10:03 Francois Perrad
2014-02-26 10:03 ` [Buildroot] [lua v2 1/4] lua: remove LUA_INSTALLED_FILES Francois Perrad
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Francois Perrad @ 2014-02-26 10:03 UTC (permalink / raw)
To: buildroot
delta V2 vs V1
- only a subset for 2014.02
- add fix for Blackfin FLAT
Francois Perrad (4):
lua: remove LUA_INSTALLED_FILES
lua: refactor install steps
lua: handles BR2_PREFER_STATIC_LIB
luarocks: never wraps script
package/Config.in | 3 +-
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch | 39 +++++++++++--
package/lua/5.2.3/lua-02-shared-libs-for-lua.patch | 39 +++++++++++--
package/lua/lua.mk | 60 ++++++--------------
package/luarocks/luarocks.mk | 1 +
5 files changed, 87 insertions(+), 55 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 1/4] lua: remove LUA_INSTALLED_FILES
2014-02-26 10:03 [Buildroot] [lua v2 0/4] lua Francois Perrad
@ 2014-02-26 10:03 ` Francois Perrad
2014-02-26 14:06 ` Peter Korsgaard
2014-02-26 10:03 ` [Buildroot] [lua v2 2/4] lua: refactor install steps Francois Perrad
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: Francois Perrad @ 2014-02-26 10:03 UTC (permalink / raw)
To: buildroot
Useless since the uninstall commands were removed in eb7bd9ef
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/lua/lua.mk | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 2c867f6..a20531c 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -104,16 +104,5 @@ define HOST_LUA_INSTALL_CMDS
$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h
endef
-LUA_INSTALLED_FILES = \
- /usr/include/lua.h \
- /usr/include/luaconf.h \
- /usr/include/lualib.h \
- /usr/include/lauxlib.h \
- /usr/lib/pkgconfig/lua.pc \
- /usr/bin/lua \
- /usr/bin/luac \
- /usr/lib/liblua.a \
- /usr/lib/liblua.so*
-
$(eval $(generic-package))
$(eval $(host-generic-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 2/4] lua: refactor install steps
2014-02-26 10:03 [Buildroot] [lua v2 0/4] lua Francois Perrad
2014-02-26 10:03 ` [Buildroot] [lua v2 1/4] lua: remove LUA_INSTALLED_FILES Francois Perrad
@ 2014-02-26 10:03 ` Francois Perrad
2014-02-26 14:07 ` Peter Korsgaard
2014-02-26 10:03 ` [Buildroot] [lua v2 3/4] lua: handles BR2_PREFER_STATIC_LIB Francois Perrad
2014-02-26 10:03 ` [Buildroot] [lua v2 4/4] luarocks: never wraps script Francois Perrad
3 siblings, 1 reply; 11+ messages in thread
From: Francois Perrad @ 2014-02-26 10:03 UTC (permalink / raw)
To: buildroot
since the comeback of version in module path (see commit ccd68a51)
the upstream Makefiles are usable for install.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch | 22 ++++++++++++++
package/lua/5.2.3/lua-02-shared-libs-for-lua.patch | 22 ++++++++++++++
package/lua/lua.mk | 30 ++------------------
3 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
index 97a7068..bd40534 100644
--- a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
+++ b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
@@ -1,8 +1,30 @@
Add the compilation of a shared library.
Compile the lua binary with the shared library.
+And install the shared library.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -44,6 +44,7 @@
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+ TO_LIB= liblua.a
++TO_SOLIB = liblua.so.$(R)
+ TO_MAN= lua.1 luac.1
+
+ # Lua version and release.
+@@ -61,6 +62,8 @@
+ install: dummy
+ cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+ cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
++ cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB)
++ ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so
+ cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+ cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
Index: b/src/Makefile
===================================================================
--- a/src/Makefile
diff --git a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
index 4679325..cd8a5bf 100644
--- a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
+++ b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
@@ -1,8 +1,30 @@
Add the compilation of a shared library.
Compile the lua binary with the shared library.
+And install the shared library.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -42,6 +42,7 @@
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+ TO_LIB= liblua.a
++TO_SOLIB = liblua.so.$(R)
+ TO_MAN= lua.1 luac.1
+
+ # Lua version and release.
+@@ -60,6 +61,8 @@
+ install: dummy
+ cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+ cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
++ cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB)
++ ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so
+ cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+ cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
Index: b/src/Makefile
===================================================================
--- a/src/Makefile
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index a20531c..c016d7e 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -65,43 +65,19 @@ define HOST_LUA_BUILD_CMDS
endef
define LUA_INSTALL_STAGING_CMDS
+ $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
- $(INSTALL) -m 0755 -D $(@D)/src/lua $(STAGING_DIR)/usr/bin/lua
- $(INSTALL) -m 0755 -D $(@D)/src/luac $(STAGING_DIR)/usr/bin/luac
- $(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
- $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
- $(INSTALL) -m 0644 -D $(@D)/src/lua.h $(STAGING_DIR)/usr/include/lua.h
- $(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include/luaconf.h
- $(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(STAGING_DIR)/usr/include/lualib.h
- $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
endef
define LUA_INSTALL_TARGET_CMDS
- $(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
- $(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
- $(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
- mkdir -p $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)
- mkdir -p $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)
+ $(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install
endef
define HOST_LUA_INSTALL_CMDS
- $(INSTALL) -m 0755 -D $(@D)/src/lua $(HOST_DIR)/usr/bin/lua
- $(INSTALL) -m 0755 -D $(@D)/src/luac $(HOST_DIR)/usr/bin/luac
- $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
- $(HOST_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
- ln -sf liblua.so.$(LUA_VERSION) $(HOST_DIR)/usr/lib/liblua.so
- $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(HOST_DIR)/usr/lib/liblua.a
+ $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
$(HOST_DIR)/usr/lib/pkgconfig/lua.pc
- $(INSTALL) -m 0644 -D $(@D)/src/lua.h $(HOST_DIR)/usr/include/lua.h
- $(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(HOST_DIR)/usr/include/luaconf.h
- $(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(HOST_DIR)/usr/include/lualib.h
- $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h
endef
$(eval $(generic-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 3/4] lua: handles BR2_PREFER_STATIC_LIB
2014-02-26 10:03 [Buildroot] [lua v2 0/4] lua Francois Perrad
2014-02-26 10:03 ` [Buildroot] [lua v2 1/4] lua: remove LUA_INSTALLED_FILES Francois Perrad
2014-02-26 10:03 ` [Buildroot] [lua v2 2/4] lua: refactor install steps Francois Perrad
@ 2014-02-26 10:03 ` Francois Perrad
2014-02-26 16:33 ` Peter Korsgaard
2014-02-26 10:03 ` [Buildroot] [lua v2 4/4] luarocks: never wraps script Francois Perrad
3 siblings, 1 reply; 11+ messages in thread
From: Francois Perrad @ 2014-02-26 10:03 UTC (permalink / raw)
To: buildroot
fix compilation with Blackfin FLAT
see http://autobuild.buildroot.net/results/b41/b4146bf821d59f694546f6e3a341394cc8fa43ce/
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/Config.in | 3 ++-
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch | 21 +++++++++++++-------
package/lua/5.2.3/lua-02-shared-libs-for-lua.patch | 21 +++++++++++++-------
package/lua/lua.mk | 19 ++++++++++++------
4 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index fca61d6..46c4ba4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -362,7 +362,8 @@ source "package/jimtcl/Config.in"
source "package/lua/Config.in"
source "package/luainterpreter/Config.in"
source "package/luajit/Config.in"
-if BR2_PACKAGE_HAS_LUA_INTERPRETER
+if BR2_PACKAGE_HAS_LUA_INTERPRETER && !BR2_PREFER_STATIC_LIB
+# lua modules are dynamically loaded, so not available on static builds
menu "Lua libraries/modules"
source "package/cgilua/Config.in"
source "package/copas/Config.in"
diff --git a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
index bd40534..3f863a5 100644
--- a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
+++ b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
@@ -1,6 +1,7 @@
Add the compilation of a shared library.
Compile the lua binary with the shared library.
And install the shared library.
+The variable BUILDMODE allows to switch between static and dynamic mode.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
@@ -20,8 +21,8 @@ Index: b/Makefile
install: dummy
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
-+ cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB)
-+ ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so
++ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || :
++ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || :
cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
@@ -37,18 +38,21 @@ Index: b/src/Makefile
CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
lundump.o lvm.o lzio.o
-@@ -36,8 +37,9 @@
+@@ -36,8 +37,13 @@
LUAC_O= luac.o print.o
ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ifneq (dynamic,$(BUILDMODE))
+ ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++else
+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
++endif
ALL_A= $(LUA_A)
+ALL_SO= $(LUA_SO)
default: $(PLAT)
-@@ -47,12 +49,18 @@
+@@ -47,12 +53,23 @@
a: $(ALL_A)
@@ -58,14 +62,17 @@ Index: b/src/Makefile
$(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
$(RANLIB) $@
--$(LUA_T): $(LUA_O) $(LUA_A)
-- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+$(LUA_SO): $(CORE_O) $(LIB_O)
+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
+ ln -fs $@.$(PKG_VERSION) $@
+
++ifneq (dynamic,$(BUILDMODE))
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++else
+$(LUA_T): $(LUA_O) $(LUA_SO)
+ $(CC) -o $@ -L. $(MYLDFLAGS) $(LUA_O) -llua $(LIBS)
++endif
$(LUAC_T): $(LUAC_O) $(LUA_A)
$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
index cd8a5bf..3cf3b24 100644
--- a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
+++ b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
@@ -1,6 +1,7 @@
Add the compilation of a shared library.
Compile the lua binary with the shared library.
And install the shared library.
+The variable BUILDMODE allows to switch between static and dynamic mode.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
@@ -20,8 +21,8 @@ Index: b/Makefile
install: dummy
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
-+ cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB)
-+ ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so
++ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || :
++ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || :
cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
@@ -37,18 +38,21 @@ Index: b/src/Makefile
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
ltm.o lundump.o lvm.o lzio.o
-@@ -43,8 +44,9 @@
+@@ -43,8 +44,13 @@
LUAC_O= luac.o
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ifneq (dynamic,$(BUILDMODE))
+ ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++else
+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
++endif
ALL_A= $(LUA_A)
+ALL_SO= $(LUA_SO)
# Targets start here.
default: $(PLAT)
-@@ -55,12 +57,18 @@
+@@ -55,12 +61,23 @@
a: $(ALL_A)
@@ -58,14 +62,17 @@ Index: b/src/Makefile
$(AR) $@ $(BASE_O)
$(RANLIB) $@
--$(LUA_T): $(LUA_O) $(LUA_A)
-- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+$(LUA_SO): $(CORE_O) $(LIB_O)
+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
+ ln -fs $@.$(PKG_VERSION) $@
+
++ifneq (dynamic,$(BUILDMODE))
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++else
+$(LUA_T): $(LUA_O) $(LUA_SO)
+ $(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS)
++endif
$(LUAC_T): $(LUAC_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index c016d7e..bf68e65 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -14,8 +14,7 @@ LUA_INSTALL_STAGING = YES
LUA_LICENSE = MIT
LUA_LICENSE_FILES = COPYRIGHT
-LUA_CFLAGS = -Wall -fPIC
-LUA_MYLIBS += -ldl
+LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
ifeq ($(BR2_PACKAGE_LUA_5_2),y)
LUA_CFLAGS += -DLUA_COMPAT_ALL
@@ -24,17 +23,23 @@ LUA_CFLAGS += -D_FILE_OFFSET_BITS=32
endif
endif
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ LUA_BUILDMODE = static
+else
+ LUA_BUILDMODE = dynamic
+ LUA_CFLAGS += -DLUA_USE_DLOPEN
+ LUA_MYLIBS += -ldl
+endif
+
ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
LUA_DEPENDENCIES = readline ncurses
LUA_MYLIBS += -lreadline -lhistory -lncurses
- LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE
+ LUA_CFLAGS += -DLUA_USE_READLINE
else
ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_LINENOISE),y)
LUA_DEPENDENCIES = linenoise
LUA_MYLIBS += -llinenoise
- LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_LINENOISE
-else
- LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+ LUA_CFLAGS += -DLUA_USE_LINENOISE
endif
endif
@@ -53,6 +58,7 @@ define LUA_BUILD_CMDS
CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
CFLAGS="$(TARGET_CFLAGS) $(LUA_CFLAGS)" \
MYLIBS="$(LUA_MYLIBS)" AR="$(TARGET_CROSS)ar rcu" \
+ BUILDMODE=$(LUA_BUILDMODE) \
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
endef
@@ -61,6 +67,7 @@ define HOST_LUA_BUILD_CMDS
CFLAGS="$(HOST_LUA_CFLAGS)" \
MYLDFLAGS="$(HOST_LDFLAGS)" \
MYLIBS="$(HOST_LUA_MYLIBS)" \
+ BUILDMODE=static \
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
endef
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 4/4] luarocks: never wraps script
2014-02-26 10:03 [Buildroot] [lua v2 0/4] lua Francois Perrad
` (2 preceding siblings ...)
2014-02-26 10:03 ` [Buildroot] [lua v2 3/4] lua: handles BR2_PREFER_STATIC_LIB Francois Perrad
@ 2014-02-26 10:03 ` Francois Perrad
2014-02-26 16:33 ` Peter Korsgaard
3 siblings, 1 reply; 11+ messages in thread
From: Francois Perrad @ 2014-02-26 10:03 UTC (permalink / raw)
To: buildroot
this config prevents the introduction of some HOST_DIR paths on target
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/luarocks/luarocks.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index 88ab22a..86e57d2 100644
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -37,6 +37,7 @@ define HOST_LUAROCKS_INSTALL_CMDS
echo "external_deps_dirs = { [[$(STAGING_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE)
echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE)
echo "rocks_trees = { [[$(TARGET_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE)
+ echo "wrap_bin_scripts = false" >> $(LUAROCKS_CONFIG_FILE)
endef
$(eval $(host-generic-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 1/4] lua: remove LUA_INSTALLED_FILES
2014-02-26 10:03 ` [Buildroot] [lua v2 1/4] lua: remove LUA_INSTALLED_FILES Francois Perrad
@ 2014-02-26 14:06 ` Peter Korsgaard
0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2014-02-26 14:06 UTC (permalink / raw)
To: buildroot
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
> Useless since the uninstall commands were removed in eb7bd9ef
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 2/4] lua: refactor install steps
2014-02-26 10:03 ` [Buildroot] [lua v2 2/4] lua: refactor install steps Francois Perrad
@ 2014-02-26 14:07 ` Peter Korsgaard
2014-02-26 15:14 ` François Perrad
0 siblings, 1 reply; 11+ messages in thread
From: Peter Korsgaard @ 2014-02-26 14:07 UTC (permalink / raw)
To: buildroot
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
> since the comeback of version in module path (see commit ccd68a51)
> the upstream Makefiles are usable for install.
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
What is the impact of this? Why do we want it for 2014.02?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 2/4] lua: refactor install steps
2014-02-26 14:07 ` Peter Korsgaard
@ 2014-02-26 15:14 ` François Perrad
2014-02-26 15:22 ` Peter Korsgaard
0 siblings, 1 reply; 11+ messages in thread
From: François Perrad @ 2014-02-26 15:14 UTC (permalink / raw)
To: buildroot
2014-02-26 15:07 GMT+01:00 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
>
> > since the comeback of version in module path (see commit ccd68a51)
> > the upstream Makefiles are usable for install.
>
> > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>
> What is the impact of this? Why do we want it for 2014.02?
See Arnout's request in :
http://patchwork.ozlabs.org/patch/323460/
http://patchwork.ozlabs.org/patch/314146/
Fran?ois
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 2/4] lua: refactor install steps
2014-02-26 15:14 ` François Perrad
@ 2014-02-26 15:22 ` Peter Korsgaard
0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2014-02-26 15:22 UTC (permalink / raw)
To: buildroot
>>>>> "Fran?ois" == Fran?ois Perrad <francois.perrad@gadz.org> writes:
> 2014-02-26 15:07 GMT+01:00 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
>>
>> > since the comeback of version in module path (see commit ccd68a51)
>> > the upstream Makefiles are usable for install.
>>
>> > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>>
>> What is the impact of this? Why do we want it for 2014.02?
> See Arnout's request in :
> http://patchwork.ozlabs.org/patch/323460/
> http://patchwork.ozlabs.org/patch/314146/
Ok, thanks. A bit more detailed commit description would be nice for
future patches would be good.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 3/4] lua: handles BR2_PREFER_STATIC_LIB
2014-02-26 10:03 ` [Buildroot] [lua v2 3/4] lua: handles BR2_PREFER_STATIC_LIB Francois Perrad
@ 2014-02-26 16:33 ` Peter Korsgaard
0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2014-02-26 16:33 UTC (permalink / raw)
To: buildroot
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
> fix compilation with Blackfin FLAT
> see http://autobuild.buildroot.net/results/b41/b4146bf821d59f694546f6e3a341394cc8fa43ce/
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [lua v2 4/4] luarocks: never wraps script
2014-02-26 10:03 ` [Buildroot] [lua v2 4/4] luarocks: never wraps script Francois Perrad
@ 2014-02-26 16:33 ` Peter Korsgaard
0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2014-02-26 16:33 UTC (permalink / raw)
To: buildroot
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
> this config prevents the introduction of some HOST_DIR paths on target
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-02-26 16:33 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-26 10:03 [Buildroot] [lua v2 0/4] lua Francois Perrad
2014-02-26 10:03 ` [Buildroot] [lua v2 1/4] lua: remove LUA_INSTALLED_FILES Francois Perrad
2014-02-26 14:06 ` Peter Korsgaard
2014-02-26 10:03 ` [Buildroot] [lua v2 2/4] lua: refactor install steps Francois Perrad
2014-02-26 14:07 ` Peter Korsgaard
2014-02-26 15:14 ` François Perrad
2014-02-26 15:22 ` Peter Korsgaard
2014-02-26 10:03 ` [Buildroot] [lua v2 3/4] lua: handles BR2_PREFER_STATIC_LIB Francois Perrad
2014-02-26 16:33 ` Peter Korsgaard
2014-02-26 10:03 ` [Buildroot] [lua v2 4/4] luarocks: never wraps script Francois Perrad
2014-02-26 16:33 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.