commit 6b1e5344d113f2e209b3091747443fb165dcefe3
Author: Jan Palus <[email protected]>
Date: Mon May 2 22:04:03 2022 +0200
adjust default lua search path
- model script search path after lua %{_datadir}/luajit/%{luajit_abi}
instead of %{_datadir}/luajit-%{version}
- add binary search path specifically for luajit
%{_libdir}/luajit/%{luajit_abi}
config.patch | 35 +++++++++++++++++++++++++++++------
luajit.spec | 14 +++++++++++---
2 files changed, 40 insertions(+), 9 deletions(-)
---
diff --git a/luajit.spec b/luajit.spec
index 7b7c5dc..f0f20df 100644
--- a/luajit.spec
+++ b/luajit.spec
@@ -21,6 +21,7 @@ ExclusiveArch: %{ix86} %{x8664} %{arm} aarch64 mips
mips64 mipsel ppc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define lua_abi 5.1
+%define luajit_abi 2.1
%description
LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming
@@ -68,22 +69,26 @@ sed -i -e '/install -m/s/-m/-p -m/' Makefile
VERSION="%{version}" \
PREFIX=%{_prefix} \
MULTILIB=%{_lib} \
+ LMULTILIB=%{_lib} \
CC="%{__cc}" \
CCOPT="%{rpmcflags} -fomit-frame-pointer" \
CCOPT_x86= \
LDFLAGS="%{rpmldflags}" \
- MULTILIB=%{_lib} \
E="@:" \
Q= \
amalg
%install
rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_libdir}/luajit/%{luajit_abi}
+
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
VERSION="%{version}" \
PREFIX=%{_prefix} \
MULTILIB=%{_lib} \
+ LMULTILIB=%{_lib} \
INSTALL_BIN=$RPM_BUILD_ROOT%{_bindir} \
INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} \
INSTALL_SHARE=$RPM_BUILD_ROOT%{_datadir} \
@@ -106,7 +111,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/luajit-%{version}
%attr(755,root,root) %{_libdir}/libluajit-%{lua_abi}.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libluajit-%{lua_abi}.so.2
-%{_datadir}/luajit-%{version}
+%dir %{_libdir}/luajit
+%dir %{_libdir}/luajit/%{luajit_abi}
+%dir %{_datadir}/luajit
+%{_datadir}/luajit/%{luajit_abi}
%{_mandir}/man1/luajit.1*
# lua module dirs (shared with lua interpreters)
%dir %{_libdir}/lua
@@ -118,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc doc/*
%attr(755,root,root) %{_libdir}/libluajit-%{lua_abi}.so
-%{_includedir}/luajit-2.1
+%{_includedir}/luajit-%{luajit_abi}
%{_pkgconfigdir}/luajit.pc
%files static
diff --git a/config.patch b/config.patch
index 39ec1d8..0ebbf20 100644
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,15 @@
diff -ur LuaJIT.orig/Makefile LuaJIT/Makefile
---- LuaJIT.orig/Makefile 2022-04-30 23:04:52.495418337 +0200
-+++ LuaJIT/Makefile 2022-04-30 23:08:13.919532873 +0200
+--- 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_SHARE= $(DPREFIX)/share
+ INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
+
+-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
@@ -13,25 +22,39 @@ diff -ur LuaJIT.orig/Makefile LuaJIT/Makefile
FILE_A= libluajit.a
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-04-30 23:10:10.372451429 +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-" VERSION "/"
++#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-04-30 23:09:37.724030857 +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)) -DVERSION=\"$(VERSION)\"
++TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH)) -DMAJVER=\"$(MAJVER)\"
-DMINVER=\"$(MINVER)\"
TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH))
ifneq (,$(PREFIX))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/luajit.git/commitdiff/6b1e5344d113f2e209b3091747443fb165dcefe3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
