SHA256
1
0
forked from pool/luajit2

15 Commits

Author SHA256 Message Date
50e961c7eb Import openSUSE:Leap:16.0 modifications 2025-08-12 12:14:44 +02:00
2bb540db63 Accepting request 1238655 from devel:languages:lua
- Updated to 2.1.20250117 (1737090214).
  * Changed file luajit2-name.patch.
  * https://github.com/openresty/luajit2/compare/v2.1-20241203...v2.1-20250117
  * Fixed recording of BC_VARG.

OBS-URL: https://build.opensuse.org/request/show/1238655
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luajit2?expand=0&rev=7
2025-01-18 12:22:41 +00:00
Илья Индиго
94084cd67b - Updated to 2.1.20250117 (1737090214).
* Changed file luajit2-name.patch.
  * https://github.com/openresty/luajit2/compare/v2.1-20241203...v2.1-20250117
  * Fixed recording of BC_VARG.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/luajit2?expand=0&rev=14
2025-01-18 10:19:27 +00:00
Илья Индиго
ddc9648a96 - Updated to 2.1.20250117 (1737090214).
* Changed file luajit2-name.patch.
  * Added riscv support.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/luajit2?expand=0&rev=13
2025-01-18 09:21:09 +00:00
4a272a2270 Accepting request 1225972 from devel:languages:lua
- Updated to 2.1.20241113 (2.1.1731486438).
  * Upstream doesn't provide a ChangeLog.

OBS-URL: https://build.opensuse.org/request/show/1225972
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luajit2?expand=0&rev=6
2024-11-25 22:20:01 +00:00
Илья Индиго
91d46ac4c3 - Updated to 2.1.20241113 (2.1.1731486438).
* Upstream doesn't provide a ChangeLog.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/luajit2?expand=0&rev=11
2024-11-23 13:22:34 +00:00
9629606a19 Accepting request 1222025 from devel:languages:lua
- Updated to 2.1.20241104 (2.1.1728714540).
  * FFI: Added missing coercion when recording 64-bit bit.*().
  * ARM64: Used ldr literal to load FP constants.

OBS-URL: https://build.opensuse.org/request/show/1222025
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luajit2?expand=0&rev=5
2024-11-07 15:28:07 +00:00
Илья Индиго
d03ca043d2 - Updated to 2.1.20241104 (2.1.1728714540).
* FFI: Added missing coercion when recording 64-bit bit.*().
  * ARM64: Used ldr literal to load FP constants.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/luajit2?expand=0&rev=9
2024-11-07 08:05:04 +00:00
3079835579 Accepting request 1196383 from devel:languages:lua
- Updated to 2.1.20240815 (2.1.1723681758).
  * Changed file luajit2-name.patch.
  * Added ppc64le support.

OBS-URL: https://build.opensuse.org/request/show/1196383
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luajit2?expand=0&rev=4
2024-08-28 19:30:29 +00:00
f900bac256 Accepting request 1173007 from devel:languages:lua
- Changed file luajit2-name.patch and fixed package.path for modules.

OBS-URL: https://build.opensuse.org/request/show/1173007
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luajit2?expand=0&rev=3
2024-05-10 10:05:39 +00:00
Илья Индиго
ab9229b6ce Accepting request 1173006 from home:13ilya
- Changed file luajit2-name.patch and fixed package.path for modules.

OBS-URL: https://build.opensuse.org/request/show/1173006
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/luajit2?expand=0&rev=5
2024-05-10 04:12:58 +00:00
12d76cf9fd Accepting request 1171854 from devel:languages:lua
- Removed %check (tests don't run, and it's not known how to run them).

OBS-URL: https://build.opensuse.org/request/show/1171854
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luajit2?expand=0&rev=2
2024-05-05 10:10:54 +00:00
Илья Индиго
0bbe70fbad Accepting request 1171853 from home:13ilya
- Removed %check (tests don't run, and it's not known how to run them).

OBS-URL: https://build.opensuse.org/request/show/1171853
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/luajit2?expand=0&rev=3
2024-05-03 21:50:25 +00:00
f9e8d4112c Accepting request 1171749 from devel:languages:lua
Need for nxinx-module-lua

OBS-URL: https://build.opensuse.org/request/show/1171749
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luajit2?expand=0&rev=1
2024-05-03 17:46:19 +00:00
63921fdf21 Accepting request 1171061 from home:13ilya
Trying again. :-)

I think I figured out what confusion in the title you were referring to.
In luajit2 from OpenResty only the project directory and another internal version are renamed.
But everything else, library name, executable name, directory with header files, pc-file and even man-file remained unchanged.
This is what is really confusing and makes lualit2 incompatible with luajit.

I fixed this in the patch luajit2-name.patch and now luajit2 is not dependent on or related to luajit in any way, except for the html documentation, it has its own executable, library and header file directory names.
Also pc and man files have been corrected.
Now it does not conflict with luajit and can be installed simultaneously with luajit without interfering with it.
By accident something intended to be built with luajit can NOT be built with luajit2!

As for the openresty package, I strongly recommend to remove it after adopting luajit2, as nobody needs it as it is!

About the tests, upstream didn't document how to use them correctly, so I decided to check with them, I hope I guessed correctly.

https://github.com/openresty/luajit2/issues/226

Leap has a too old version of perl and they can only work in Tumbleweed.

If you have any constructive comments, I'm willing to discuss them. :-)

OBS-URL: https://build.opensuse.org/request/show/1171061
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/luajit2?expand=0&rev=1
2024-05-03 06:51:00 +00:00
6 changed files with 53 additions and 30 deletions

Binary file not shown.

Binary file not shown.

BIN
luajit2-2.1-20250529.tar.gz LFS Normal file

Binary file not shown.

View File

@@ -1,20 +1,20 @@
diff -Pdpru luajit2-2.1-20240815.orig/Makefile luajit2-2.1-20240815/Makefile
--- luajit2-2.1-20240815.orig/Makefile 2024-08-15 03:29:18.000000000 +0300
+++ luajit2-2.1-20240815/Makefile 2024-08-28 06:32:57.210186012 +0300
@@ -38,10 +38,10 @@ DPREFIX= $(DESTDIR)$(PREFIX)
INSTALL_BIN= $(DPREFIX)/bin
diff -Pdpru luajit2-2.1-20250117.orig/Makefile luajit2-2.1-20250117/Makefile
--- luajit2-2.1-20250117.orig/Makefile 2025-01-17 08:03:34.000000000 +0300
+++ luajit2-2.1-20250117/Makefile 2025-01-18 12:03:03.025681445 +0300
@@ -39,10 +39,10 @@ INSTALL_BIN= $(DPREFIX)/bin
INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
INSTALL_SHARE= $(DPREFIX)/share
INSTALL_SHARE_= $(PREFIX)/share
INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_)
-INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
+INSTALL_DEFINC= $(DPREFIX)/include/luajit2-$(MMVERSION)
INSTALL_INC= $(INSTALL_DEFINC)
-export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
+export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit2-$(MMVERSION)
INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
-export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION)
+export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit2-$(MMVERSION)
INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit
INSTALL_LMODD= $(INSTALL_SHARE)/lua
INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
@@ -50,23 +50,20 @@ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
@@ -51,23 +51,20 @@ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
INSTALL_MAN= $(INSTALL_SHARE)/man/man1
INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
@@ -47,7 +47,7 @@ diff -Pdpru luajit2-2.1-20240815.orig/Makefile luajit2-2.1-20240815/Makefile
INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
@@ -78,20 +75,27 @@ RM= rm -f
@@ -79,20 +76,27 @@ RM= rm -f
MKDIR= mkdir -p
RMDIR= rmdir 2>/dev/null
SYMLINK= ln -sf
@@ -81,7 +81,7 @@ diff -Pdpru luajit2-2.1-20240815.orig/Makefile luajit2-2.1-20240815/Makefile
FILE_MAN= luajit.1
FILE_PC= luajit.pc
FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h
@@ -130,25 +134,25 @@ install: $(INSTALL_DEP)
@@ -131,25 +135,25 @@ install: $(INSTALL_DEP)
@echo "==== Installing LuaJIT $(VERSION) to $(PREFIX) ===="
$(MKDIR) $(INSTALL_DIRS)
cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
@@ -111,10 +111,10 @@ diff -Pdpru luajit2-2.1-20240815.orig/Makefile luajit2-2.1-20240815/Makefile
for file in $(FILES_JITLIB); do \
$(UNINSTALL) $(INSTALL_JITLIB)/$$file; \
done
diff -Pdpru luajit2-2.1-20240815.orig/src/luaconf.h luajit2-2.1-20240815/src/luaconf.h
--- luajit2-2.1-20240815.orig/src/luaconf.h 2024-08-15 03:29:18.000000000 +0300
+++ luajit2-2.1-20240815/src/luaconf.h 2024-08-28 06:35:50.295523664 +0300
@@ -51,7 +51,7 @@
diff -Pdpru luajit2-2.1-20250117.orig/src/luaconf.h luajit2-2.1-20250117/src/luaconf.h
--- luajit2-2.1-20250117.orig/src/luaconf.h 2025-01-17 08:03:34.000000000 +0300
+++ luajit2-2.1-20250117/src/luaconf.h 2025-01-18 12:04:14.635265329 +0300
@@ -50,7 +50,7 @@
#endif
#ifndef LUA_LJDIR
@@ -123,9 +123,9 @@ diff -Pdpru luajit2-2.1-20240815.orig/src/luaconf.h luajit2-2.1-20240815/src/lua
#endif
#define LUA_JPATH ";" LUA_LJDIR "/?.lua"
diff -Pdpru luajit2-2.1-20240815.orig/src/Makefile luajit2-2.1-20240815/src/Makefile
--- luajit2-2.1-20240815.orig/src/Makefile 2024-08-15 03:29:18.000000000 +0300
+++ luajit2-2.1-20240815/src/Makefile 2024-08-28 06:40:25.429926912 +0300
diff -Pdpru luajit2-2.1-20250117.orig/src/Makefile luajit2-2.1-20250117/src/Makefile
--- luajit2-2.1-20250117.orig/src/Makefile 2025-01-17 08:03:34.000000000 +0300
+++ luajit2-2.1-20250117/src/Makefile 2025-01-18 12:09:11.660041483 +0300
@@ -214,11 +214,11 @@ TARGET_AR= $(CROSS)ar rcus
TARGET_STRIP= $(CROSS)strip

View File

@@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Jul 11 14:07:00 UTC 2025 - Илья Индиго <ilya@ilya.top>
- Updated to 2.1.20250529 (1748495995).
* https://github.com/openresty/luajit2/compare/v2.1-20250117...v2.1-20250529
-------------------------------------------------------------------
Sat Jan 18 10:16:26 UTC 2025 - Илья Индиго <ilya@ilya.top>
- Updated to 2.1.20250117 (1737090214).
* Changed file luajit2-name.patch.
* https://github.com/openresty/luajit2/compare/v2.1-20241203...v2.1-20250117
* Fixed recording of BC_VARG.
-------------------------------------------------------------------
Sat Nov 23 13:05:56 UTC 2024 - Илья Индиго <ilya@ilya.top>
- Updated to 2.1.20241113 (2.1.1731486438).
* Upstream doesn't provide a ChangeLog.
-------------------------------------------------------------------
Thu Nov 7 08:00:47 UTC 2024 - Илья Индиго <ilya@ilya.top>
- Updated to 2.1.20241104 (2.1.1728714540).
* FFI: Added missing coercion when recording 64-bit bit.*().
* ARM64: Used ldr literal to load FP constants.
-------------------------------------------------------------------
Wed Aug 28 03:54:34 UTC 2024 - Илья Индиго <ilya@ilya.top>

View File

@@ -1,7 +1,7 @@
#
# spec file for package luajit2
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,8 +20,8 @@
%define so_ver 2
%define lib_ver 5_1-%{so_ver}
%define major 2.1
%define minor 20240815
%define upstream 1723681758
%define minor 20250529
%define upstream 1748495995
Name: luajit2
Version: %{major}.%{minor}
Release: 0
@@ -75,8 +75,7 @@ Devel files for %{name} package.
PREFIX=%{_prefix} \
MULTILIB=%{_lib}
%post -n lib%{name}-%{lib_ver} -p /sbin/ldconfig
%postun -n lib%{name}-%{lib_ver} -p /sbin/ldconfig
%ldconfig_scriptlets -n lib%{name}-%{lib_ver}
%files
%{_bindir}/%{name}