commit c7f67ef07463ab08d725e793529d2167ca6609bf
Author: Jan Palus <at...@pld-linux.org>
Date: Wed Oct 11 23:31:39 2023 +0200
up to 20231008 snap
config.patch | 16 ++++++++--------
luajit.spec | 10 ++++++----
2 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/luajit.spec b/luajit.spec
index 984a85d..a127712 100644
--- a/luajit.spec
+++ b/luajit.spec
@@ -1,7 +1,9 @@
# TODO
# - x32 not supported by upstream:
http://www.freelists.org/post/luajit/Building-luajit202-on-x32,1
-%define snap 20230712
+%define snap 20231008
+# git show -s --format=%ct
+%define rolling_ver 1696795921
Summary: Just-in-Time compiler for Lua
Summary(pl.UTF-8): Kompilator JIT dla języka Lua
Name: luajit
@@ -11,7 +13,7 @@ License: MIT
Group: Libraries
# Source0Download: http://luajit.org/download.html
Source0: %{name}-%{version}-%{snap}.tar.xz
-# Source0-md5: 5923912a8c25122549aaacfaa9644ed1
+# Source0-md5: fe5b266c010ffa72a2c327c23544d92a
Patch0: config.patch
URL: http://luajit.org/
BuildRequires: sed >= 4.0
@@ -73,6 +75,8 @@ Statyczna biblioteka LuaJIT.
# preserve timestamps
sed -i -e '/install -m/s/-m/-p -m/' Makefile
+echo %{rolling_ver} > .relver
+
%build
# Q= - enable verbose output
# E= @: - disable @echo messages
@@ -109,8 +113,6 @@ install -d $RPM_BUILD_ROOT%{_libdir}/luajit/%{luajit_abi}
INSTALL_PKGCONFIG=$RPM_BUILD_ROOT%{_pkgconfigdir} \
LDCONFIG="/sbin/ldconfig -n"
-ln -s luajit-%{version} $RPM_BUILD_ROOT%{_bindir}/luajit
-
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/config.patch b/config.patch
index 92a0cd7..dbbc9a1 100644
--- a/config.patch
+++ b/config.patch
@@ -2,21 +2,21 @@ 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_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
INSTALL_INC= $(INSTALL_DEFINC)
--INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
-+INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit/$(MAJVER).$(MINVER)
+-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)
@@ -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)|"
+ -e "s|^multilib=.*|multilib=$(MULTILIB)|" \
+- -e "s|^relver=.*|relver=$(RELVER)|"
++ -e "s|^relver=.*|relver=$(RELVER)|" \
++ -e "s|^version=.*|version=$(VERSION)|"
ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|"
endif
@@ -27,7 +27,7 @@ diff -ur LuaJIT.orig/src/luaconf.h LuaJIT/src/luaconf.h
#endif
#define LUA_LROOT "/usr/local"
#define LUA_LUADIR "/lua/5.1/"
--#define LUA_LJDIR "/luajit-2.1.0-beta3/"
+-#define LUA_LJDIR "/luajit-2.1/"
+#define LUA_LJDIR "/luajit/" MAJVER "." MINVER "/"
#ifdef LUA_ROOT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/luajit.git/commitdiff/c7f67ef07463ab08d725e793529d2167ca6609bf
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
