diff --git a/lua-build-system.patch b/lua-build-system.patch index 288b7d9..6e345c8 100644 --- a/lua-build-system.patch +++ b/lua-build-system.patch @@ -44,12 +44,12 @@ Subject: build system TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a -TO_MAN= lua.1 luac.1 -+TO_LIB= liblua$(V).a ++TO_LIB= liblua$(V).la +TO_MAN= lua$(V).1 luac$(V).1 # Lua version and release. V= 5.4 -@@ -52,13 +52,13 @@ R= $V.5 +@@ -52,13 +52,13 @@ R= $V.6 all: $(PLAT) $(PLATS) help test clean: @@ -111,7 +111,7 @@ Subject: build system PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris -LUA_A= liblua.a -+LUA_A= liblua$(V).a ++LUA_A= liblua$(V).la CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) @@ -139,7 +139,7 @@ Subject: build system $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(LUA_A) luac.lo -lm -o $@ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(LUA_A) luac.lo -o $@ test: - ./$(LUA_T) -v diff --git a/lua54.changes b/lua54.changes index 50ac443..113214f 100644 --- a/lua54.changes +++ b/lua54.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 9 12:43:31 UTC 2023 - Matej Cepl + +- Experimenting with lua 5.4.6-rc1 (release 5.4.5 has been + effectively withdrawn). + ------------------------------------------------------------------- Sun Apr 30 12:22:03 UTC 2023 - Matej Cepl diff --git a/lua54.spec b/lua54.spec index b7a1578..666fce5 100644 --- a/lua54.spec +++ b/lua54.spec @@ -164,8 +164,6 @@ make linux-readline %{_smp_mflags} VERBOSE=1 -C src \ INSTALL_LIB="%{buildroot}%{_libdir}" \ INSTALL_MAN="%{buildroot}%{_mandir}/man1" -find %{buildroot} -name \*.so\* -ls - find %{buildroot} -type f -name "*.la" -delete -print # create pkg-config file @@ -195,19 +193,9 @@ for file in lua luac ; do ln -sf "%{_sysconfdir}/alternatives/${file}.1%{ext_man}" "%{buildroot}%{_mandir}/man1/${file}.1%{ext_man}" done -# /home/abuild/rpmbuild/BUILDROOT/lua54-5.4.6~rc1-0.x86_64/usr/lib64/liblua5.4.so - -# lrwxrwxrwx. 1 abuild abuild 27 May 3 21:50 liblua.so -> /etc/alternatives/liblua.so -# lrwxrwxrwx. 1 abuild abuild 18 May 3 21:50 liblua.so.5.4 -> liblua5.4.so.5.4.0 -# -rw-r--r--. 1 abuild abuild 30352 May 3 21:50 liblua5.4.a -# lrwxrwxrwx. 1 abuild abuild 18 May 3 21:50 liblua5.4.so.0 -> liblua5.4.so.5.4.0 -# lrwxrwxrwx. 1 abuild abuild 18 May 3 21:50 liblua5.4.so.5.4 -> liblua5.4.so.5.4.0 -# drwxr-xr-x. 1 abuild abuild 6 May 3 21:50 lua -# drwxr-xr-x. 1 abuild abuild 30 May 3 21:50 pkgconfig - # Compat link with older unprefixed library and with soname 0 from deb/etc ln -s %{_libdir}/liblua%{major_version}.so.%{major_version}.0 %{buildroot}%{_libdir}/liblua%{major_version}.so.%{major_version} -ln -s %{_libdir}/liblua%{major_version}.so.%{major_version}.0 %{buildroot}%{_libdir}/liblua%{major_version}.so.0 +# ln -s %%{_libdir}/liblua%%{major_version}.so.%%{major_version}.0 %%{buildroot}%%{_libdir}/liblua%%{major_version}.so.0 ln -s %{_libdir}/liblua%{major_version}.so.%{major_version}.0 %{buildroot}%{_libdir}/liblua.so.%{major_version} # Library devel alternatives touch %{buildroot}%{_sysconfdir}/alternatives/liblua.so