Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(patches): backport revert override of ljlibd #14230

Merged
merged 1 commit into from
Jan 29, 2025
Merged

chore(patches): backport revert override of ljlibd #14230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions build/openresty/patches/LuaJIT-2.1-20240815_03-revert-reflect-override-of-ljlibd.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
diff --git a/bundle/LuaJIT-2.1-20240815/Makefile b/bundle/LuaJIT-2.1-20240815/Makefile
index cac43c2..6ae2c49 100644
--- a/bundle/LuaJIT-2.1-20240815/Makefile
+++ b/bundle/LuaJIT-2.1-20240815/Makefile
@@ -41,7 +41,7 @@ INSTALL_SHARE= $(DPREFIX)/share
INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
INSTALL_INC= $(INSTALL_DEFINC)

-export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
+INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
INSTALL_LMODD= $(INSTALL_SHARE)/lua
INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
diff --git a/bundle/LuaJIT-2.1-20240815/src/Makefile b/bundle/LuaJIT-2.1-20240815/src/Makefile
index 134e7dd..f87762e 100644
--- a/bundle/LuaJIT-2.1-20240815/src/Makefile
+++ b/bundle/LuaJIT-2.1-20240815/src/Makefile
@@ -304,9 +304,6 @@ endif
ifneq (,$(LMULTILIB))
TARGET_XCFLAGS+= -DLUA_LMULTILIB=\"$(LMULTILIB)\"
endif
-ifneq (,$(INSTALL_LJLIBD))
- TARGET_XCFLAGS+= -DLUA_LJDIR=\"$(INSTALL_LJLIBD)\"
-endif

##############################################################################
# Target system detection.
diff --git a/bundle/LuaJIT-2.1-20240815/src/luaconf.h b/bundle/LuaJIT-2.1-20240815/src/luaconf.h
index 0c97c2d..c311a97 100644
--- a/bundle/LuaJIT-2.1-20240815/src/luaconf.h
+++ b/bundle/LuaJIT-2.1-20240815/src/luaconf.h
@@ -37,6 +37,7 @@
#endif
#define LUA_LROOT "/usr/local"
#define LUA_LUADIR "/lua/5.1/"
+#define LUA_LJDIR "/luajit-2.1/"

#ifdef LUA_ROOT
#define LUA_JROOT LUA_ROOT
@@ -50,11 +51,7 @@
#define LUA_RCPATH
#endif

-#ifndef LUA_LJDIR
-#define LUA_LJDIR LUA_JROOT "/share/luajit-2.1"
-#endif
-
-#define LUA_JPATH ";" LUA_LJDIR "/?.lua"
+#define LUA_JPATH ";" LUA_JROOT "/share" LUA_LJDIR "?.lua"
#define LUA_LLDIR LUA_LROOT "/share" LUA_LUADIR
#define LUA_LCDIR LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR
#define LUA_LLPATH ";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua"
Loading