summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Perrad <fperrad@gmail.com>2014-03-01 17:23:03 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-03-03 22:09:51 (GMT)
commit87c28ee58af8f3fdabeda8ad3b71056104442d5d (patch)
tree7eed8abf0d552618c4279d8d9f5e3ab21e2c923e
parentca3761fbff4bbf3d44b822c733bc8571b69ccafd (diff)
downloadbuildroot-87c28ee58af8f3fdabeda8ad3b71056104442d5d.tar.gz
buildroot-87c28ee58af8f3fdabeda8ad3b71056104442d5d.tar.bz2
luajit: refactor without shared-lib.patch
the variable BUILDMODE does the job Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/luajit/luajit-02-shared-lib.patch17
-rw-r--r--package/luajit/luajit.mk1
2 files changed, 1 insertions, 17 deletions
diff --git a/package/luajit/luajit-02-shared-lib.patch b/package/luajit/luajit-02-shared-lib.patch
deleted file mode 100644
index 361e5c2..0000000
--- a/package/luajit/luajit-02-shared-lib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Compile the luajit binary dynamically against the luajit library
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-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"
-
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 72720d8..32596a1 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -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