saltbundle/lua51
SHA256
7
0
Fork 0
forked from pool/lua51
Code Pull Requests Activity
Files
factory
lua51/lua-build-system.patch
Dominique Leuenberger e61d50374d Accepting request 1295837 from devel:languages:lua 
- Switch from update-alternatives to libalternatives (and
  dependency on lua-interpreter)
- improve .gitignore and overall improve the packaging.
- this package also provides devel symlink directly and conflicts other -devel packages

  They include lua51-devel and expects rpm macros to be available.
  on the interpreter binary
* libdl is required not librt
* fix libraries in pkgconfig file
- move the lua rpm macros to the devel package to avoid conflict
- Correction in Provides and Obsolete for lua-libs
  * too many variables in an assignment may cause a C stack
    overflow
  * an error in a module loaded through the '-l' option shows no
  * gsub may go wild when wrongly called without its third
    argument and with a large subject
  * table.remove removes last element of a table when given
    an out-of-bound index
  * stand-alone interpreter shows incorrect error message when
  * debug.sethook/gethook may overflow the thread's stack

OBS-URL: https://build.opensuse.org/request/show/1295837
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lua51?expand=0&rev=18
2025-08-03 11:35:47 +00:00

209 lines
6.6 KiB
Diff
Raw Permalink Blame History

From: Enrico Tassi <gareuselesinge@debian.org>
Date: Sun, 1 Mar 2015 16:13:52 +0100
Subject: build system
---
Makefile | 26 +++++++++++++++-----------
src/Makefile | 28 ++++++++++++++++------------
src/luaconf.h | 8 ++++++--
testes/libs/makefile | 11 +++++++----
4 files changed, 44 insertions(+), 29 deletions(-)
Index: lua-5.1.5/Makefile
===================================================================
--- lua-5.1.5.orig/Makefile 2012-02-10 10:50:23.000000000 +0100
+++ lua-5.1.5/Makefile 2025-07-19 17:02:14.322726003 +0200
@@ -2,6 +2,8 @@
# see INSTALL for installation instructions
# see src/Makefile and src/luaconf.h for further customization
+export LIBTOOL=libtool --quiet
+
# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
# Your platform. See PLATS for possible values.
@@ -9,22 +11,23 @@
# Where to install. The installation starts in the src and doc directories,
# so take care if INSTALL_TOP is not an absolute path.
-INSTALL_TOP= /usr/local
+INSTALL_TOP= /usr/
INSTALL_BIN= $(INSTALL_TOP)/bin
-INSTALL_INC= $(INSTALL_TOP)/include
+INSTALL_INC= $(INSTALL_TOP)/include/lua$(V)/
INSTALL_LIB= $(INSTALL_TOP)/lib
-INSTALL_MAN= $(INSTALL_TOP)/man/man1
+INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
#
# You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
-INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
+INSTALL_CMOD= $(INSTALL_LIB)/lua/$V
# How to install. If your install program does not support "-p", then you
# may have to run ranlib on the installed liblua.a (do "make ranlib").
INSTALL= install -p
INSTALL_EXEC= $(INSTALL) -m 0755
INSTALL_DATA= $(INSTALL) -m 0644
+INSTALL_LIBTOOL= $(LIBTOOL) --mode=install install -m 0644
#
# If you don't have install you can use cp instead.
# INSTALL= cp -p
@@ -41,10 +44,10 @@
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
# What to install.
-TO_BIN= lua luac
+TO_BIN= lua$(V) luac$(V)
TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
-TO_LIB= liblua.a
-TO_MAN= lua.1 luac.1
+TO_LIB= liblua$(V).la
+TO_MAN= lua$(V).1 luac$(V).1
# Lua version and release.
V= 5.1
@@ -53,16 +56,17 @@
all: $(PLAT)
$(PLATS) clean:
- cd src && $(MAKE) $@
+ cd src && $(MAKE) $@ V=$(V)
test: dummy
- src/lua test/hello.lua
+ $(LIBTOOL) --mode=execute -dlopen src/liblua$(V).la src/lua$(V) -v
install: dummy
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
+ cd src && $(LIBTOOL) --mode=install $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+ cd src && $(INSTALL_LIBTOOL) $(TO_LIB) $(INSTALL_LIB)
+ rm -f $(INSTALL_LIB)/liblua$(V).a
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
ranlib:
Index: lua-5.1.5/src/Makefile
===================================================================
--- lua-5.1.5.orig/src/Makefile 2012-02-13 21:41:22.000000000 +0100
+++ lua-5.1.5/src/Makefile 2025-07-19 17:02:14.323016861 +0200
@@ -8,32 +8,37 @@
PLAT= none
CC= gcc
-CFLAGS= -O2 -Wall $(MYCFLAGS)
+CFLAGS= -Wall $(MYCFLAGS)
AR= ar rcu
RANLIB= ranlib
RM= rm -f
LIBS= -lm $(MYLIBS)
+LIBDIR=/usr/lib
MYCFLAGS=
MYLDFLAGS=
-MYLIBS=
+MYLIBS=-ldl
+
+%.o : %.c
+ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -c $< -o $@
# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-LUA_A= liblua.a
+LUA_A= liblua$(V).la
CORE_O= lapi.o lcode.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
+ lundump.o lvm.o lzio.o print.o
LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
lstrlib.o loadlib.o linit.o
+BASE_O= $(CORE_O) $(LIB_O)
-LUA_T= lua
+LUA_T= lua$(V)
LUA_O= lua.o
-LUAC_T= luac
-LUAC_O= luac.o print.o
+LUAC_T= luac$(V)
+LUAC_O= luac.o
ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
@@ -48,14 +53,13 @@
a: $(ALL_A)
$(LUA_A): $(CORE_O) $(LIB_O)
- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
- $(RANLIB) $@
+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -lm -ldl $(BASE_O:.o=.lo) -rpath $(LIBDIR) -version-info 6:0:1 -o $(LUA_A)
$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(LIBS) $(LUA_A) -Wl,-E lua.lo -o $@
-$(LUAC_T): $(LUAC_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+$(LUAC_T): $(LUAC_O) $(BASE_O)
+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(BASE_O:.o=.lo) $(LIBS)
clean:
$(RM) $(ALL_T) $(ALL_O)
Index: lua-5.1.5/src/luaconf.h
===================================================================
--- lua-5.1.5.orig/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100
+++ lua-5.1.5/src/luaconf.h 2025-07-19 17:02:14.323256121 +0200
@@ -95,13 +95,17 @@
#else
#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT2 "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
+#define LUA_LDIR2 LUA_ROOT2 "share/lua/5.1/"
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+#define LUA_CDIR2 LUA_ROOT2 "lib/lua/5.1/"
#define LUA_PATH_DEFAULT \
"./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
+ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua"
#define LUA_CPATH_DEFAULT \
- "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
+ "./?.so;" LUA_CDIR"?.so;" LUA_CDIR2"?.so;" LUA_CDIR"loadall.so"
#endif
Index: lua-5.1.5/testes/libs/makefile
===================================================================
--- lua-5.1.5.orig/testes/libs/makefile 2016-01-18 16:32:17.000000000 +0100
+++ lua-5.1.5/testes/libs/makefile 2025-07-19 19:41:44.657503160 +0200
@@ -1,16 +1,19 @@
+CFLAGS ?= -Wall -O2 -ansi -fPIC
+CC = gcc
+
all: lib1.so lib11.so lib2.so lib21.so -lib2.so
lib1.so: lib1.c
- gcc -Wall -O2 -I../../ -ansi -shared -o lib1.so lib1.c
+ $(CC) $(CFLAGS) -shared -o lib1.so lib1.c
lib11.so: lib11.c
- gcc -Wall -O2 -I../../ -ansi -shared -o lib11.so lib11.c
+ $(CC) $(CFLAGS) -shared -o lib11.so lib11.c
lib2.so: lib2.c
- gcc -Wall -O2 -I../../ -ansi -shared -o lib2.so lib2.c
+ $(CC) $(CFLAGS) -shared -o lib2.so lib2.c
lib21.so: lib21.c
- gcc -Wall -O2 -I../../ -ansi -shared -o lib21.so lib21.c
+ $(CC) $(CFLAGS) -shared -o lib21.so lib21.c
-lib2.so: lib2.so
cp lib2.so ./-lib2.so
View Git Blame Copy Permalink