[packages/luajit.git] / config.patch

diff -ur LuaJIT.orig/Makefile LuaJIT/Makefile
--- LuaJIT.orig/Makefile	2022-05-01 14:24:18.622666652 +0200
+++ LuaJIT/Makefile	2022-05-01 14:40:11.423331452 +0200
@@ -35,7 +35,7 @@
 INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
 INSTALL_INC=   $(INSTALL_DEFINC)
 
-INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
+INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit/$(MAJVER).$(MINVER)
 INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
 INSTALL_LMODD= $(INSTALL_SHARE)/lua
 INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
@@ -77,7 +77,8 @@
 UNINSTALL= $(RM)
 LDCONFIG= ldconfig -n 2>/dev/null
 SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
-            -e "s|^multilib=.*|multilib=$(MULTILIB)|"
+            -e "s|^multilib=.*|multilib=$(MULTILIB)|" \
+            -e "s|^version=.*|version=$(VERSION)|"
 ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
   SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|"
 endif
diff -ur LuaJIT.orig/src/luaconf.h LuaJIT/src/luaconf.h
--- LuaJIT.orig/src/luaconf.h	2022-04-29 09:13:18.000000000 +0200
+++ LuaJIT/src/luaconf.h	2022-05-01 14:36:10.660525525 +0200
@@ -37,7 +37,7 @@
 #endif
 #define LUA_LROOT	"/usr/local"
 #define LUA_LUADIR	"/lua/5.1/"
-#define LUA_LJDIR	"/luajit-2.1.0-beta3/"
+#define LUA_LJDIR	"/luajit/" MAJVER "." MINVER "/"
 
 #ifdef LUA_ROOT
 #define LUA_JROOT	LUA_ROOT
@@ -55,11 +55,12 @@
 #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"
+#define LUA_JCPATH	";" LUA_ROOT "/" LUA_MULTILIB LUA_LJDIR "?.so"
 #define LUA_LCPATH1	";" LUA_LCDIR "?.so"
 #define LUA_LCPATH2	";" LUA_LCDIR "loadall.so"
 
 #define LUA_PATH_DEFAULT	"./?.lua" LUA_JPATH LUA_LLPATH LUA_RLPATH
-#define LUA_CPATH_DEFAULT	"./?.so" LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2
+#define LUA_CPATH_DEFAULT	"./?.so" LUA_JCPATH LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2
 #endif
 
 /* Environment variable names for path overrides and initialization code. */
diff -ur LuaJIT.orig/src/Makefile LuaJIT/src/Makefile
--- LuaJIT.orig/src/Makefile	2022-04-29 09:13:18.000000000 +0200
+++ LuaJIT/src/Makefile	2022-05-01 14:26:35.049917859 +0200
@@ -283,7 +283,7 @@
   TARGET_XLIBS+= -lpthread
 endif
 
-TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH))
+TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH)) -DMAJVER=\"$(MAJVER)\" -DMINVER=\"$(MINVER)\"
 TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH))
 
 ifneq (,$(PREFIX))
Commit	Line	Data
e7941b74	1	diff -ur LuaJIT.orig/Makefile LuaJIT/Makefile
6b1e5344 JP	2	--- LuaJIT.orig/Makefile 2022-05-01 14:24:18.622666652 +0200
	3	+++ LuaJIT/Makefile 2022-05-01 14:40:11.423331452 +0200
	4	@@ -35,7 +35,7 @@
3d4534b0 JP	5	INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
3d4534b0 JP	6	INSTALL_INC= $(INSTALL_DEFINC)
6b1e5344 JP	7
	8	-INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
	9	+INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit/$(MAJVER).$(MINVER)
	10	INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
	11	INSTALL_LMODD= $(INSTALL_SHARE)/lua
	12	INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
e7941b74 JP	13	@@ -77,7 +77,8 @@
	14	UNINSTALL= $(RM)
	15	LDCONFIG= ldconfig -n 2>/dev/null
	16	SED_PC= sed -e "s\|^prefix=.*\|prefix=$(PREFIX)\|" \
	17	- -e "s\|^multilib=.*\|multilib=$(MULTILIB)\|"
	18	+ -e "s\|^multilib=.*\|multilib=$(MULTILIB)\|" \
	19	+ -e "s\|^version=.*\|version=$(VERSION)\|"
3d4534b0 JP	20	ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
	21	SED_PC+= -e "s\|^includedir=.*\|includedir=$(INSTALL_INC)\|"
	22	endif
e7941b74 JP	23	diff -ur LuaJIT.orig/src/luaconf.h LuaJIT/src/luaconf.h
e7941b74 JP	24	--- LuaJIT.orig/src/luaconf.h 2022-04-29 09:13:18.000000000 +0200
6b1e5344	25	+++ LuaJIT/src/luaconf.h 2022-05-01 14:36:10.660525525 +0200
e7941b74 JP	26	@@ -37,7 +37,7 @@
	27	#endif
	28	#define LUA_LROOT "/usr/local"
	29	#define LUA_LUADIR "/lua/5.1/"
	30	-#define LUA_LJDIR "/luajit-2.1.0-beta3/"
6b1e5344	31	+#define LUA_LJDIR "/luajit/" MAJVER "." MINVER "/"
e7941b74 JP	32
	33	#ifdef LUA_ROOT
	34	#define LUA_JROOT LUA_ROOT
6b1e5344 JP	35	@@ -55,11 +55,12 @@
	36	#define LUA_LLDIR LUA_LROOT "/share" LUA_LUADIR
	37	#define LUA_LCDIR LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR
	38	#define LUA_LLPATH ";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua"
	39	+#define LUA_JCPATH ";" LUA_ROOT "/" LUA_MULTILIB LUA_LJDIR "?.so"
	40	#define LUA_LCPATH1 ";" LUA_LCDIR "?.so"
	41	#define LUA_LCPATH2 ";" LUA_LCDIR "loadall.so"
	42
	43	#define LUA_PATH_DEFAULT "./?.lua" LUA_JPATH LUA_LLPATH LUA_RLPATH
	44	-#define LUA_CPATH_DEFAULT "./?.so" LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2
	45	+#define LUA_CPATH_DEFAULT "./?.so" LUA_JCPATH LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2
	46	#endif
	47
	48	/* Environment variable names for path overrides and initialization code. */
e7941b74 JP	49	diff -ur LuaJIT.orig/src/Makefile LuaJIT/src/Makefile
e7941b74 JP	50	--- LuaJIT.orig/src/Makefile 2022-04-29 09:13:18.000000000 +0200
6b1e5344	51	+++ LuaJIT/src/Makefile 2022-05-01 14:26:35.049917859 +0200
e7941b74 JP	52	@@ -283,7 +283,7 @@
	53	TARGET_XLIBS+= -lpthread
	54	endif
	55
	56	-TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH))
6b1e5344	57	+TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH)) -DMAJVER=\"$(MAJVER)\" -DMINVER=\"$(MINVER)\"
e7941b74 JP	58	TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH))
	59
	60	ifneq (,$(PREFIX))