luajit: refactor without dont-strip.patch
PATCH 1/4 luajit: refactor without dont-strip.patch
the variable TARGET_STRIP does the job
--- package/luajit/luajit-03-dont-strip.patch | 23 ----------------------- package/luajit/luajit.mk | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 package/luajit/luajit-03-dont-strip.patch
package/luajit/luajit-03-dont-strip.patch deleted +0 -23
@@ -1,23 +0,0 @@ -Don't strip the library and binary - -This allows Buildroot to do it if needed, but only if needed. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -665,12 +665,10 @@ - $(LUAJIT_SO): $(LJVMCORE_O) - $(E) "DYNLINK $@" - $(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO) $(TARGET_ALIBS) -- $(Q)$(TARGET_STRIP) $@ - - $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) - $(E) "LINK $@" - $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS) -- $(Q)$(TARGET_STRIP) $@ - $(E) "OK Successfully built LuaJIT" - - ##############################################################################
package/luajit/luajit.mk +1 -1
@@ -37,7 +37,7 @@ define LUAJIT_BUILD_CMDS DYNAMIC_CC="$(TARGET_CC) -fPIC" \ TARGET_LD="$(TARGET_CC)" \ TARGET_AR="$(TARGET_AR) rcus" \ - TARGET_STRIP="$(TARGET_STRIP)" \ + TARGET_STRIP=@: \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ HOST_CC="$(LUAJIT_HOST_CC)" \
Signature · 1 line
1.7.9.5
PATCH 2/4 luajit: refactor without shared-lib.patch
the variable BUILDMODE does the job
--- package/luajit/luajit-02-shared-lib.patch | 17 ----------------- package/luajit/luajit.mk | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 package/luajit/luajit-02-shared-lib.patch
package/luajit/luajit-02-shared-lib.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Compile the luajit binary dynamically against the luajit library - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -669,7 +669,7 @@ - - $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) - $(E) "LINK $@" -- $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS) -+ $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS) - $(Q)$(TARGET_STRIP) $@ - $(E) "OK Successfully built LuaJIT" -
package/luajit/luajit.mk +1 -0
@@ -44,6 +44,7 @@ define LUAJIT_BUILD_CMDS HOST_CFLAGS="$(HOST_CFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ $(LUAJIT_NO_LARGEFILE) \ + BUILDMODE=dynamic \ -C $(@D) amalg endef
Signature · 1 line
1.7.9.5
PATCH 3/4 luajit: add host-luajit
In reply to Francois Perrad--- package/luajit/luajit.mk | 9 +++++++++ 1 file changed, 9 insertions(+)
package/luajit/luajit.mk +9 -0
@@ -56,4 +56,13 @@ define LUAJIT_INSTALL_TARGET_CMDS $(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install endef +define HOST_LUAJIT_BUILD_CMDS + $(MAKE) PREFIX="/usr" BUILDMODE=static -C $(@D) amalg +endef + +define HOST_LUAJIT_INSTALL_CMDS + $(MAKE) PREFIX="/usr" DESTDIR="$(HOST_DIR)" -C $(@D) install +endef + $(eval $(generic-package)) +$(eval $(host-generic-package))
Signature · 1 line
1.7.9.5
PATCH 4/4 luarocks: allow to work with host-luajit
In reply to Francois Perrad--- package/luainterpreter/luainterpreter.mk | 4 ++++ package/luarocks/luarocks.mk | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)
package/luainterpreter/luainterpreter.mk +4 -0
@@ -5,8 +5,12 @@ ############################################################# LUAINTERPRETER_SOURCE = +HOST_LUAINTERPRETER_SOURCE = LUAINTERPRETER_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LUA_INTERPRETER)) LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION)) $(eval $(generic-package)) +$(eval $(host-generic-package)) + +LUA_RUN = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUA_INTERPRETER))
package/luarocks/luarocks.mk +2 -2
@@ -9,7 +9,7 @@ LUAROCKS_SITE = http://luarocks.org/releases/ LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING -HOST_LUAROCKS_DEPENDENCIES = host-lua luainterpreter +HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter luainterpreter LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
@@ -42,4 +42,4 @@ endef $(eval $(host-generic-package)) LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \ - $(HOST_DIR)/usr/bin/lua $(HOST_DIR)/usr/bin/luarocks + $(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks
Signature · 1 line
1.7.9.5
PATCH 1/4 luajit: refactor without dont-strip.patch
In reply to Francois PerradDear Francois Perrad,
Quoted 8 lines · Francois Perrad
the variable
TARGET_STRIPdoes the jobSigned-off-by Francois Perrad <[email protected]>--- package/luajit/luajit-03-dont-strip.patch | 23 ----------------------- package/luajit/luajit.mk | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 package/luajit/luajit-03-dont-strip.patch
Looks good to me. Just a question below.
package/luajit/luajit.mk define LUAJIT_BUILD_CMDS · line 40
Quoted 1 line
package/luajit/luajit.mk +1
-0+ TARGET_STRIP=@: \
Any reason to use @: instead of just : ?
Also, personally, I would probably prefer TARGET_STRIP=true. I know it's the same, but I find the usage of ':' a bit hard to read.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/4 luajit: refactor without dont-strip.patch
2014-02-27 23:59 GMT+01:00 Thomas Petazzoni
<[email protected]>:
Quoted 12 lines
Dear Francois Perrad,
Quoted 8 lines · Francois Perrad
the variable
TARGET_STRIPdoes the jobSigned-off-by Francois Perrad <[email protected]>--- package/luajit/luajit-03-dont-strip.patch | 23 ----------------------- package/luajit/luajit.mk | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 package/luajit/luajit-03-dont-strip.patch
Quoted 7 lines
Looks good to me. Just a question below.
Quoted 1 line
+ TARGET_STRIP=@: \
Any reason to use @: instead of just : ?
I've seen this value in the Makefile at
http://repo.or.cz/w/luajit-2.0.git/blob/HEAD:/src/Makefile#l354
so I copy/paste it.
Fran?ois
Quoted 12 lines
Also, personally, I would probably prefer TARGET_STRIP=true. I know it's the same, but I find the usage of ':' a bit hard to read.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot