summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2016-12-09 10:46:16 +0800
committerruki <[email protected]>2016-12-09 10:46:16 +0800
commit67e78a7b90b27c4c2e6dc39c65713f57f773e298 (patch)
tree3f7065aee013f943fb7919bfb964a2a8c7636dbd
parent42f8620876db9172362a61a5749b6f04ea54ee63 (diff)
fix luajit for rhel
-rwxr-xr-xcore/makefile9
-rw-r--r--core/pkg/luajit.pkg/lib/release/linux/x86_64/libluajit_rhel.abin0 -> 511304 bytes
2 files changed, 8 insertions, 1 deletions
diff --git a/core/makefile b/core/makefile
index 4cf6bfc5b..0aad8533b 100755
--- a/core/makefile
+++ b/core/makefile
@@ -273,6 +273,13 @@ base_LIBPATH :=
base_LIBNAMES := rt m dl pthread
endif
+# config luajit
+ifeq ($(PLAT),linux)
+luajit_LIBNAMES := $(shell if [ -f "/etc/redhat-release" ]; then echo "luajit_rhel"; else echo "luajit"; fi )
+else
+luajit_LIBNAMES := luajit
+endif
+
# select package directory
ifneq ($(PACKAGE),)
PKG_DIR := $(PACKAGE)
@@ -460,7 +467,7 @@ config : .null
@$(ECHO) "luajit_LIBPATH =" >> .config.mak
@$(ECHO) "luajit_INCFLAGS =" >> .config.mak
@$(ECHO) "luajit_LIBFLAGS =" >> .config.mak
- @$(ECHO) "luajit_LIBNAMES =luajit" >> .config.mak
+ @$(ECHO) "luajit_LIBNAMES =$(luajit_LIBNAMES)" >> .config.mak
@$(ECHO) "export LUAJIT" >> .config.mak
@$(ECHO) "export luajit_INCPATH" >> .config.mak
@$(ECHO) "export luajit_LIBPATH" >> .config.mak
diff --git a/core/pkg/luajit.pkg/lib/release/linux/x86_64/libluajit_rhel.a b/core/pkg/luajit.pkg/lib/release/linux/x86_64/libluajit_rhel.a
new file mode 100644
index 000000000..e70c65772
--- /dev/null
+++ b/core/pkg/luajit.pkg/lib/release/linux/x86_64/libluajit_rhel.a
Binary files differ