wok-next annotate lua5.1/stuff/patches/lua5.1.5.patch @ rev 20791

Up gnome-games, and add/update all the required dependencies
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jun 10 01:56:40 2018 +0300 (2018-06-10)
parents
children
rev   line source
al@20791 1 --- a/Makefile
al@20791 2 +++ b/Makefile
al@20791 3 @@ -9,11 +9,11 @@
al@20791 4
al@20791 5 # Where to install. The installation starts in the src and doc directories,
al@20791 6 # so take care if INSTALL_TOP is not an absolute path.
al@20791 7 -INSTALL_TOP= /usr/local
al@20791 8 +INSTALL_TOP= $(DESTDIR)/usr
al@20791 9 INSTALL_BIN= $(INSTALL_TOP)/bin
al@20791 10 -INSTALL_INC= $(INSTALL_TOP)/include
al@20791 11 +INSTALL_INC= $(INSTALL_TOP)/include/lua/$V
al@20791 12 INSTALL_LIB= $(INSTALL_TOP)/lib
al@20791 13 -INSTALL_MAN= $(INSTALL_TOP)/man/man1
al@20791 14 +INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
al@20791 15 #
al@20791 16 # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
al@20791 17 # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
al@20791 18 @@ -24,7 +24,7 @@
al@20791 19 # may have to run ranlib on the installed liblua.a (do "make ranlib").
al@20791 20 INSTALL= install -p
al@20791 21 INSTALL_EXEC= $(INSTALL) -m 0755
al@20791 22 -INSTALL_DATA= $(INSTALL) -m 0644
al@20791 23 +INSTALL_DATA= cp -d
al@20791 24 #
al@20791 25 # If you don't have install you can use cp instead.
al@20791 26 # INSTALL= cp -p
al@20791 27 @@ -41,9 +41,9 @@
al@20791 28 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
al@20791 29
al@20791 30 # What to install.
al@20791 31 -TO_BIN= lua luac
al@20791 32 +TO_BIN= lua$V luac$V
al@20791 33 TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
al@20791 34 -TO_LIB= liblua.a
al@20791 35 +TO_LIB= liblua$V.a liblua$V.so liblua$V.so.$V liblua$V.so.$R
al@20791 36 TO_MAN= lua.1 luac.1
al@20791 37
al@20791 38 # Lua version and release.
al@20791 39 @@ -53,7 +53,7 @@
al@20791 40 all: $(PLAT)
al@20791 41
al@20791 42 $(PLATS) clean:
al@20791 43 - cd src && $(MAKE) $@
al@20791 44 + cd src && $(MAKE) $@ V=$(V) R=$(R)
al@20791 45
al@20791 46 test: dummy
al@20791 47 src/lua test/hello.lua
al@20791 48 Only in source/: lua5.1-5.1.5/done.lua5.1.5.patch
al@20791 49 --- a/etc/lua.pc
al@20791 50 +++ b/etc/lua.pc
al@20791 51 @@ -8,24 +8,24 @@
al@20791 52 R= 5.1.5
al@20791 53
al@20791 54 # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
al@20791 55 -prefix= /usr/local
al@20791 56 +prefix= /usr
al@20791 57 INSTALL_BIN= ${prefix}/bin
al@20791 58 -INSTALL_INC= ${prefix}/include
al@20791 59 -INSTALL_LIB= ${prefix}/lib
al@20791 60 +INSTALL_INC= ${prefix}/include/lua/${V}
al@20791 61 +INSTALL_LIB= ${prefix}/lib/lua/${V}
al@20791 62 INSTALL_MAN= ${prefix}/man/man1
al@20791 63 INSTALL_LMOD= ${prefix}/share/lua/${V}
al@20791 64 INSTALL_CMOD= ${prefix}/lib/lua/${V}
al@20791 65
al@20791 66 # canonical vars
al@20791 67 exec_prefix=${prefix}
al@20791 68 -libdir=${exec_prefix}/lib
al@20791 69 -includedir=${prefix}/include
al@20791 70 +libdir=${exec_prefix}/lib/lua/${V}
al@20791 71 +includedir=${prefix}/include/lua/${V}
al@20791 72
al@20791 73 Name: Lua
al@20791 74 Description: An Extensible Extension Language
al@20791 75 Version: ${R}
al@20791 76 Requires:
al@20791 77 -Libs: -L${libdir} -llua -lm
al@20791 78 +Libs: -L${libdir} -llua${V} -lm
al@20791 79 Cflags: -I${includedir}
al@20791 80
al@20791 81 # (end of lua.pc)
al@20791 82 --- a/src/Makefile
al@20791 83 +++ b/src/Makefile
al@20791 84 @@ -8,7 +8,8 @@
al@20791 85 PLAT= none
al@20791 86
al@20791 87 CC= gcc
al@20791 88 -CFLAGS= -O2 -Wall $(MYCFLAGS)
al@20791 89 +CFLAGS ?= -O2 -Wall
al@20791 90 +CFLAGS += $(MYCFLAGS)
al@20791 91 AR= ar rcu
al@20791 92 RANLIB= ranlib
al@20791 93 RM= rm -f
al@20791 94 @@ -22,21 +23,22 @@
al@20791 95
al@20791 96 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
al@20791 97
al@20791 98 -LUA_A= liblua.a
al@20791 99 +LUA_A= liblua$(V).a
al@20791 100 +LUA_SO= liblua$(V).so
al@20791 101 CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
al@20791 102 lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
al@20791 103 lundump.o lvm.o lzio.o
al@20791 104 LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
al@20791 105 lstrlib.o loadlib.o linit.o
al@20791 106
al@20791 107 -LUA_T= lua
al@20791 108 +LUA_T= lua$(V)
al@20791 109 LUA_O= lua.o
al@20791 110
al@20791 111 -LUAC_T= luac
al@20791 112 +LUAC_T= luac$(V)
al@20791 113 LUAC_O= luac.o print.o
al@20791 114
al@20791 115 ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
al@20791 116 -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
al@20791 117 +ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
al@20791 118 ALL_A= $(LUA_A)
al@20791 119
al@20791 120 default: $(PLAT)
al@20791 121 @@ -50,6 +52,11 @@
al@20791 122 $(LUA_A): $(CORE_O) $(LIB_O)
al@20791 123 $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
al@20791 124 $(RANLIB) $@
al@20791 125 +
al@20791 126 +$(LUA_SO): $(CORE_O) $(LIB_O)
al@20791 127 + $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
al@20791 128 + ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
al@20791 129 + ln -sf $(LUA_SO).$(R) $(LUA_SO)
al@20791 130
al@20791 131 $(LUA_T): $(LUA_O) $(LUA_A)
al@20791 132 $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
al@20791 133 --- a/src/luaconf.h
al@20791 134 +++ b/src/luaconf.h
al@20791 135 @@ -94,7 +94,7 @@
al@20791 136 ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
al@20791 137
al@20791 138 #else
al@20791 139 -#define LUA_ROOT "/usr/local/"
al@20791 140 +#define LUA_ROOT "/usr/"
al@20791 141 #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
al@20791 142 #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
al@20791 143 #define LUA_PATH_DEFAULT \