build / midipix_build

Clone
Source Code
GIT

7f55af vars/build.vars:lua: updated to 5.3.4, autotoolized; based on Fedora packaging

3 files Authored by Conan_Kudo 6 years ago, Committed by Lucio Andrés Illanes Albornoz (arab, vxp) 6 years ago,
raw patch tree parent
3 files changed. 449 lines added. 132 lines removed.
patches/lua-5.3.3.local.patch
file removed
-128
patches/lua-5.3.4.local.patch
file added
+445
vars/build.vars
file modified
+4 -4 
    vars/build.vars:lua: updated to 5.3.4, autotoolized; based on Fedora packaging
    
    Signed-off-by: Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>
file removed
-128
patches/lua-5.3.3.local.patch DELETED
@@ -1,128 +0,0 @@
1
- --- lua-5.3.3/src/luaconf.h.orig 2016-05-01 20:06:09.000000000 +0000
2
- +++ lua-5.3.3/src/luaconf.h 2016-06-23 10:02:23.471604030 +0000
3
- @@ -72,6 +72,12 @@
4
- #endif
5
-
6
-
7
- +#if defined(LUA_USE_MIDIPIX)
8
- +#define LUA_USE_POSIX
9
- +#define LUA_USE_DLOPEN /* needs an extra library: -ldl */
10
- +#endif
11
- +
12
- +
13
- /*
14
- @@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for
15
- ** C89 ('long' and 'double'); Windows always has '__int64', so it does
16
- @@ -188,7 +194,7 @@
17
-
18
- #else /* }{ */
19
-
20
- -#define LUA_ROOT "/usr/local/"
21
- +#define LUA_ROOT "/usr/"
22
- #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
23
- #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
24
- #define LUA_PATH_DEFAULT \
25
- --- lua-5.3.3/src/Makefile.orig 2015-05-27 11:10:11.000000000 +0000
26
- +++ lua-5.3.3/src/Makefile 2016-06-23 10:45:40.323546394 +0000
27
- @@ -26,9 +26,10 @@
28
-
29
- # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
30
-
31
- -PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
32
- +PLATS= aix bsd c89 freebsd generic linux macosx midipix mingw posix solaris
33
-
34
- LUA_A= liblua.a
35
- +LUA_SO= liblua.so
36
- CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
37
- lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
38
- ltm.o lundump.o lvm.o lzio.o
39
- @@ -36,14 +37,14 @@
40
- lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o
41
- BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
42
-
43
- -LUA_T= lua
44
- +LUA_T= lua$(V)
45
- LUA_O= lua.o
46
-
47
- -LUAC_T= luac
48
- +LUAC_T= luac$(V)
49
- LUAC_O= luac.o
50
-
51
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
52
- -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
53
- +ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
54
- ALL_A= $(LUA_A)
55
-
56
- # Targets start here.
57
- @@ -56,9 +57,14 @@
58
- a: $(ALL_A)
59
-
60
- $(LUA_A): $(BASE_O)
61
- - $(AR) $@ $(BASE_O)
62
- + $(AR) rcs $@ $(BASE_O)
63
- $(RANLIB) $@
64
-
65
- +$(LUA_SO): $(CORE_O) $(LIB_O)
66
- + $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
67
- + ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
68
- + ln -sf $(LUA_SO).$(R) $(LUA_SO)
69
- +
70
- $(LUA_T): $(LUA_O) $(LUA_A)
71
- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
72
-
73
- @@ -112,6 +118,9 @@
74
- macosx:
75
- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc
76
-
77
- +midipix:
78
- + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MIDIPIX" SYSLIBS="-Wl,-E -ldl"
79
- +
80
- mingw:
81
- $(MAKE) "LUA_A=lua53.dll" "LUA_T=lua.exe" \
82
- "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
83
- --- lua-5.3.3/Makefile.orig 2015-05-27 11:10:11.000000000 +0000
84
- +++ lua-5.3.3/Makefile 2016-06-23 10:59:29.519527991 +0000
85
- @@ -36,23 +36,25 @@
86
- # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
87
-
88
- # Convenience platforms targets.
89
- -PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
90
- +PLATS= aix bsd c89 freebsd generic linux macosx midipix mingw posix solaris
91
- +
92
- +# Lua version and release.
93
- +V= 5.3
94
- +R= $V.3
95
-
96
- # What to install.
97
- -TO_BIN= lua luac
98
- +TO_BIN= lua$(V) luac$(V)
99
- +TO_BIN_LINKS= lua$(V):lua luac$(V):luac
100
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
101
- TO_LIB= liblua.a
102
- +TO_LIBSO= liblua.so liblua.so.$V
103
- TO_MAN= lua.1 luac.1
104
-
105
- -# Lua version and release.
106
- -V= 5.3
107
- -R= $V.3
108
- -
109
- # Targets start here.
110
- all: $(PLAT)
111
-
112
- $(PLATS) clean:
113
- - cd src && $(MAKE) $@
114
- + cd src && $(MAKE) $@ V=$(V) R=$(R)
115
-
116
- test: dummy
117
- src/lua -v
118
- @@ -60,8 +62,10 @@
119
- install: dummy
120
- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
121
- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
122
- + cd src && for FNAME in $(TO_BIN_LINKS); do echo ln -fs $${FNAME%:*} $(INSTALL_BIN)/$${FNAME#*:}; ln -fs $${FNAME%:*} $(INSTALL_BIN)/$${FNAME#*:}; done
123
- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
124
- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
125
- + cd src && $(INSTALL_EXEC) $(TO_LIBSO) $(INSTALL_LIB)
126
- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
127
-
128
- uninstall:
file added
+445
patches/lua-5.3.4.local.patch ADDED
@@ -0,0 +1,445 @@
1
+ From c13b3e5466ab1ced0f78bdc83aec77b4fef0b5e4 Mon Sep 17 00:00:00 2001
2
+ From: Neal Gompa <ngompa13@gmail.com>
3
+ Date: Sat, 28 Apr 2018 09:22:35 -0400
4
+ Subject: [PATCH] Autotoolize Lua 5.3.4
5
+
6
+ This is a super-patch of the Red Hat/Fedora patches for building Lua
7
+ using Autotools.
8
+
9
+ It is made up of the following patches:
10
+ * lua-5.3.0-autotoolize.patch
11
+ * lua-5.3.0-idsize.patch
12
+ * lua-5.2.2-configure-linux.patch
13
+ * lua-5.3.0-configure-compat-module.patch
14
+
15
+ The canonical source of these patches is: https://src.fedoraproject.org/rpms/lua
16
+
17
+ Note that on minor version bumps, the full version must be replaced
18
+ in configure.ac to match.
19
+
20
+ That is, all instances of "5.3.4" must be replaced with the new 5.3.x
21
+ version. This can be accomplished with sed on this patch.
22
+
23
+ Cf. https://src.fedoraproject.org/rpms/lua/blob/ed24e54f3b10a67e141af985ff63b49337667b5d/f/lua.spec#_103-104
24
+
25
+ Before bumping Lua, check to see if the Fedora patch set for autotoolizing
26
+ has changed and use those to rebase this super-patch.
27
+ ---
28
+ Makefile.am | 9 +
29
+ configure.ac | 226 +++++++++++++++++++++++
30
+ doc/Makefile.am | 12 ++
31
+ src/.gitignore | 15 ++
32
+ src/Makefile.am | 46 +++++
33
+ src/lua.pc.in | 13 ++
34
+ src/{luaconf.h => luaconf.h.template.in} | 14 +-
35
+ 7 files changed, 331 insertions(+), 4 deletions(-)
36
+ create mode 100644 Makefile.am
37
+ create mode 100644 configure.ac
38
+ create mode 100644 doc/Makefile.am
39
+ create mode 100644 src/.gitignore
40
+ create mode 100644 src/Makefile.am
41
+ create mode 100644 src/lua.pc.in
42
+ rename src/{luaconf.h => luaconf.h.template.in} (98%)
43
+
44
+ diff --git a/Makefile.am b/Makefile.am
45
+ new file mode 100644
46
+ index 0000000..ca86fd2
47
+ --- /dev/null
48
+ +++ b/Makefile.am
49
+ @@ -0,0 +1,9 @@
50
+ +SUBDIRS = src doc
51
+ +
52
+ +EXTRA_DIST = README
53
+ +SUBDIRS = src doc
54
+ +
55
+ +EXTRA_DIST = README
56
+ +SUBDIRS = src doc
57
+ +
58
+ +EXTRA_DIST = README
59
+ diff --git a/configure.ac b/configure.ac
60
+ new file mode 100644
61
+ index 0000000..53d0140
62
+ --- /dev/null
63
+ +++ b/configure.ac
64
+ @@ -0,0 +1,226 @@
65
+ +AC_PREREQ(2.59)
66
+ +AC_INIT([lua], [5.3.4], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
67
+ +AC_SUBST([MAJOR_VERSION], [5.3])
68
+ +
69
+ +AC_CONFIG_HEADERS([config.h])
70
+ +AC_CONFIG_SRCDIR([src/lapi.c])
71
+ +
72
+ +AM_INIT_AUTOMAKE([1.9 foreign])
73
+ +
74
+ +AC_PROG_CC
75
+ +AC_PROG_LIBTOOL
76
+ +
77
+ +AC_ARG_WITH(
78
+ + [compat-module],
79
+ + [AC_HELP_STRING([--with-compat-module], [Enable LUA_COMPAT_MODULE functions [default=no]])],
80
+ + [use_compat_module=$withval],
81
+ + [use_compat_module=no]
82
+ +)
83
+ +
84
+ +COMPAT_DEFS="#undef LUA_COMPAT_ALL"
85
+ +if test "x$use_compat_module" == "xyes"; then
86
+ + COMPAT_DEFS="#define LUA_COMPAT_5_1
87
+ +#define LUA_COMPAT_5_2"
88
+ +fi
89
+ +AC_SUBST(COMPAT_DEFS)
90
+ +
91
+ +AC_ARG_WITH(
92
+ + [readline],
93
+ + [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
94
+ + [use_readline=$withval],
95
+ + [use_readline=yes]
96
+ +)
97
+ +
98
+ +LUA_LIBS="-lm"
99
+ +
100
+ +# Check for readline
101
+ +READLINE_DEFS="#undef LUA_USE_READLINE"
102
+ +if test "x$use_readline" == "xyes"; then
103
+ + AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
104
+ + AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
105
+ + if test "x$use_readline" == "xno"; then
106
+ + AC_MSG_WARN([readline headers could not be found, disabling readline support])
107
+ + else
108
+ + READLINE_DEFS="#define LUA_USE_READLINE"
109
+ + READLINE_LIBS="-lreadline -lncurses"
110
+ + fi
111
+ +fi
112
+ +AC_SUBST(READLINE_DEFS)
113
+ +AC_SUBST(READLINE_LIBS)
114
+ +
115
+ +case "$host" in
116
+ + *-mingw*) use_os=win32 ;;
117
+ + *-darwin*) use_os=macosx ;;
118
+ + *-linux*) use_os=linux ;;
119
+ + *) use_os=posix ;;
120
+ +esac
121
+ +
122
+ +POSIX_DEFS="#undef LUA_USE_POSIX"
123
+ +LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
124
+ +LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
125
+ +
126
+ +if test "x$use_os" == "xwin32"; then
127
+ + LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
128
+ +elif test "x$use_os" == "xmacosx"; then
129
+ + POSIX_DEFS="#define LUA_USE_POSIX"
130
+ + LUA_DL_DEFS="#define LUA_DL_DYLD"
131
+ +elif test "x$use_os" == "xlinux"; then
132
+ + POSIX_DEFS="#define LUA_USE_LINUX"
133
+ + LUA_DL_DEFS="#define LUA_DL_DLOPEN"
134
+ + LUA_LIBS="$LUA_LIBS -ldl"
135
+ +elif test "x$use_os" == "xposix"; then
136
+ + POSIX_DEFS="#define LUA_USE_POSIX"
137
+ + LUA_DL_DEFS="#define LUA_DL_DLOPEN"
138
+ + LUA_LIBS="$LUA_LIBS -ldl"
139
+ +fi
140
+ +AC_SUBST(POSIX_DEFS)
141
+ +AC_SUBST(LUA_DL_DEFS)
142
+ +AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
143
+ +
144
+ +AC_SUBST(LUA_LIBS)
145
+ +
146
+ +AC_CONFIG_FILES([Makefile
147
+ + src/Makefile
148
+ + src/lua.pc
149
+ + src/luaconf.h.template
150
+ + doc/Makefile
151
+ +])
152
+ +AC_OUTPUT
153
+ +AC_PREREQ(2.59)
154
+ +AC_INIT([lua], [5.3.4], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
155
+ +AC_SUBST([MAJOR_VERSION], [5.3])
156
+ +
157
+ +AC_CONFIG_HEADERS([config.h])
158
+ +AC_CONFIG_SRCDIR([src/lapi.c])
159
+ +
160
+ +AM_INIT_AUTOMAKE([1.9 foreign])
161
+ +
162
+ +AC_PROG_CC
163
+ +AC_PROG_LIBTOOL
164
+ +
165
+ +AC_ARG_WITH(
166
+ + [readline],
167
+ + [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
168
+ + [use_readline=$withval],
169
+ + [use_readline=yes]
170
+ +)
171
+ +
172
+ +LUA_LIBS="-lm"
173
+ +
174
+ +# Check for readline
175
+ +READLINE_DEFS="#undef LUA_USE_READLINE"
176
+ +if test "x$use_readline" == "xyes"; then
177
+ + AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
178
+ + AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
179
+ + if test "x$use_readline" == "xno"; then
180
+ + AC_MSG_WARN([readline headers could not be found, disabling readline support])
181
+ + else
182
+ + READLINE_DEFS="#define LUA_USE_READLINE"
183
+ + READLINE_LIBS="-lreadline -lncurses"
184
+ + fi
185
+ +fi
186
+ +AC_SUBST(READLINE_DEFS)
187
+ +AC_SUBST(READLINE_LIBS)
188
+ +
189
+ +case "$host" in
190
+ + *-mingw*) use_os=win32 ;;
191
+ + *-darwin*) use_os=macosx ;;
192
+ + *) use_os=posix ;;
193
+ +esac
194
+ +
195
+ +POSIX_DEFS="#undef LUA_USE_POSIX"
196
+ +LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
197
+ +LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
198
+ +
199
+ +if test "x$use_os" == "xwin32"; then
200
+ + LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
201
+ +elif test "x$use_os" == "xmacosx"; then
202
+ + POSIX_DEFS="#define LUA_USE_POSIX"
203
+ + LUA_DL_DEFS="#define LUA_DL_DYLD"
204
+ +elif test "x$use_os" == "xposix"; then
205
+ + POSIX_DEFS="#define LUA_USE_POSIX"
206
+ + LUA_DL_DEFS="#define LUA_DL_DLOPEN"
207
+ + LUA_LIBS="$LUA_LIBS -ldl"
208
+ +fi
209
+ +AC_SUBST(POSIX_DEFS)
210
+ +AC_SUBST(LUA_DL_DEFS)
211
+ +AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
212
+ +
213
+ +AC_SUBST(LUA_LIBS)
214
+ +
215
+ +AC_CONFIG_FILES([Makefile
216
+ + src/Makefile
217
+ + src/lua.pc
218
+ + src/luaconf.h.template
219
+ + doc/Makefile
220
+ +])
221
+ +AC_OUTPUT
222
+ +AC_PREREQ(2.59)
223
+ +AC_INIT([lua], [5.3.4], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
224
+ +AC_SUBST([MAJOR_VERSION], [5.3])
225
+ +
226
+ +AC_CONFIG_HEADERS([config.h])
227
+ +AC_CONFIG_SRCDIR([src/lapi.c])
228
+ +
229
+ +AM_INIT_AUTOMAKE([1.9 foreign])
230
+ +
231
+ +AC_PROG_CC
232
+ +AC_PROG_LIBTOOL
233
+ +
234
+ +AC_ARG_WITH(
235
+ + [readline],
236
+ + [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
237
+ + [use_readline=$withval],
238
+ + [use_readline=yes]
239
+ +)
240
+ +
241
+ +LUA_LIBS="-lm"
242
+ +
243
+ +# Check for readline
244
+ +READLINE_DEFS="#undef LUA_USE_READLINE"
245
+ +if test "x$use_readline" == "xyes"; then
246
+ + AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
247
+ + AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
248
+ + if test "x$use_readline" == "xno"; then
249
+ + AC_MSG_WARN([readline headers could not be found, disabling readline support])
250
+ + else
251
+ + READLINE_DEFS="#define LUA_USE_READLINE"
252
+ + READLINE_LIBS="-lreadline -lncurses"
253
+ + fi
254
+ +fi
255
+ +AC_SUBST(READLINE_DEFS)
256
+ +AC_SUBST(READLINE_LIBS)
257
+ +
258
+ +case "$host" in
259
+ + *-mingw*) use_os=win32 ;;
260
+ + *-darwin*) use_os=macosx ;;
261
+ + *) use_os=posix ;;
262
+ +esac
263
+ +
264
+ +POSIX_DEFS="#undef LUA_USE_POSIX"
265
+ +LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
266
+ +LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
267
+ +
268
+ +if test "x$use_os" == "xwin32"; then
269
+ + LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
270
+ +elif test "x$use_os" == "xmacosx"; then
271
+ + POSIX_DEFS="#define LUA_USE_POSIX"
272
+ + LUA_DL_DEFS="#define LUA_DL_DYLD"
273
+ +elif test "x$use_os" == "xposix"; then
274
+ + POSIX_DEFS="#define LUA_USE_POSIX"
275
+ + LUA_DL_DEFS="#define LUA_DL_DLOPEN"
276
+ + LUA_LIBS="$LUA_LIBS -ldl"
277
+ +fi
278
+ +AC_SUBST(POSIX_DEFS)
279
+ +AC_SUBST(LUA_DL_DEFS)
280
+ +AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
281
+ +
282
+ +AC_SUBST(LUA_LIBS)
283
+ +
284
+ +AC_CONFIG_FILES([Makefile
285
+ + src/Makefile
286
+ + src/lua.pc
287
+ + src/luaconf.h.template
288
+ + doc/Makefile
289
+ +])
290
+ +AC_OUTPUT
291
+ diff --git a/doc/Makefile.am b/doc/Makefile.am
292
+ new file mode 100644
293
+ index 0000000..9a72205
294
+ --- /dev/null
295
+ +++ b/doc/Makefile.am
296
+ @@ -0,0 +1,12 @@
297
+ +man1_MANS = lua.1 luac.1
298
+ +
299
+ +EXTRA_DIST = \
300
+ + contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
301
+ +man1_MANS = lua.1 luac.1
302
+ +
303
+ +EXTRA_DIST = \
304
+ + contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
305
+ +man1_MANS = lua.1 luac.1
306
+ +
307
+ +EXTRA_DIST = \
308
+ + contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
309
+ diff --git a/src/.gitignore b/src/.gitignore
310
+ new file mode 100644
311
+ index 0000000..44aac47
312
+ --- /dev/null
313
+ +++ b/src/.gitignore
314
+ @@ -0,0 +1,15 @@
315
+ +lua
316
+ +lua.pc
317
+ +luac
318
+ +luaconf.h
319
+ +luaconf.h.template
320
+ +lua
321
+ +lua.pc
322
+ +luac
323
+ +luaconf.h
324
+ +luaconf.h.template
325
+ +lua
326
+ +lua.pc
327
+ +luac
328
+ +luaconf.h
329
+ +luaconf.h.template
330
+ diff --git a/src/Makefile.am b/src/Makefile.am
331
+ new file mode 100644
332
+ index 0000000..33f5b2e
333
+ --- /dev/null
334
+ +++ b/src/Makefile.am
335
+ @@ -0,0 +1,46 @@
336
+ +AM_CFLAGS = -Wall
337
+ +
338
+ +include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp
339
+ +
340
+ +nodist_include_HEADERS = luaconf.h
341
+ +
342
+ +lib_LTLIBRARIES = liblua.la
343
+ +liblua_la_LDFLAGS = -release @MAJOR_VERSION@
344
+ +liblua_la_SOURCES = \
345
+ + lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \
346
+ + ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
347
+ + loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
348
+ + ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \
349
+ + lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \
350
+ + lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \
351
+ + lundump.h lvm.h lzio.h
352
+ +
353
+ +pkgconfigdir = $(libdir)/pkgconfig
354
+ +pkgconfig_DATA = lua.pc
355
+ +
356
+ +bin_PROGRAMS = lua luac
357
+ +
358
+ +lua_SOURCES = lua.c
359
+ +lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
360
+ +lua_DEPENDENCIES = liblua.la
361
+ +
362
+ +luac_SOURCES = luac.c
363
+ +# Statically link liblua against luac since luac uses symbols not exported in liblua
364
+ +luac_LDADD = .libs/liblua.a @LUA_LIBS@
365
+ +luac_DEPENDENCIES = liblua.la
366
+ +
367
+ +EXTRA_DIST = luaconf.h.template
368
+ +BUILT_SOURCES = luaconf.h
369
+ +CLEANFILES = luaconf.h luaconf.h.template
370
+ +
371
+ +readline_defs = @READLINE_DEFS@
372
+ +
373
+ +edit = sed \
374
+ + -e 's,%prefix%,$(prefix),g' \
375
+ + -e 's,%lua_datadir%,$(datadir),g' \
376
+ + -e 's,%lua_libdir%,$(libdir),g'
377
+ +
378
+ +luaconf.h : luaconf.h.template
379
+ + rm -f $@ $@.tmp
380
+ + $(edit) $< >$@.tmp
381
+ + mv $@.tmp $@
382
+ diff --git a/src/lua.pc.in b/src/lua.pc.in
383
+ new file mode 100644
384
+ index 0000000..25faa8d
385
+ --- /dev/null
386
+ +++ b/src/lua.pc.in
387
+ @@ -0,0 +1,13 @@
388
+ +V= @MAJOR_VERSION@
389
+ +R= @VERSION@
390
+ +prefix= @prefix@
391
+ +exec_prefix=${prefix}
392
+ +libdir= @libdir@
393
+ +includedir=${prefix}/include
394
+ +
395
+ +Name: Lua
396
+ +Description: An Extensible Extension Language
397
+ +Version: ${R}
398
+ +Requires:
399
+ +Libs: -llua @LUA_LIBS@
400
+ +Cflags: -I${includedir}
401
+ diff --git a/src/luaconf.h b/src/luaconf.h.template.in
402
+ similarity index 98%
403
+ rename from src/luaconf.h
404
+ rename to src/luaconf.h.template.in
405
+ index f37bea0..c7ff227 100644
406
+ --- a/src/luaconf.h
407
+ +++ b/src/luaconf.h.template.in
408
+ @@ -11,6 +11,12 @@
409
+ #include <limits.h>
410
+ #include <stddef.h>
411
+
412
+ +@POSIX_DEFS@
413
+ +@LUA_DL_DEFS@
414
+ +@LUA_BUILD_AS_DLL_DEFS@
415
+ +@READLINE_DEFS@
416
+ +@COMPAT_DEFS@
417
+ +
418
+
419
+ /*
420
+ ** ===================================================================
421
+ @@ -200,9 +206,9 @@
422
+
423
+ #else /* }{ */
424
+
425
+ -#define LUA_ROOT "/usr/local/"
426
+ -#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
427
+ -#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
428
+ +#define LUA_ROOT "@prefix@/"
429
+ +#define LUA_LDIR "@datadir@/lua/" LUA_VDIR "/"
430
+ +#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/"
431
+ #define LUA_PATH_DEFAULT \
432
+ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
433
+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
434
+ @@ -738,7 +744,7 @@
435
+ @@ of a function in debug information.
436
+ ** CHANGE it if you want a different size.
437
+ */
438
+ -#define LUA_IDSIZE 60
439
+ +#define LUA_IDSIZE 512
440
+
441
+
442
+ /*
443
+ --
444
+ 2.17.0
445
+
file modified
+4 -4
vars/build.vars CHANGED
@@ -483,12 +483,12 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
483
483
: ${PKG_LIBKSBA_VERSION:=1.3.5};
484
484
: ${PKG_LIBKSBA_URL:=https://www.gnupg.org/ftp/gcrypt/libksba/libksba-${PKG_LIBKSBA_VERSION}.tar.bz2};
485
485
: ${PKG_LIBUDNS_URLS_GIT:=libudns=https://github.com/shadowsocks/libudns.git@master};
486
- : ${PKG_LUA_SHA256SUM:=5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2};
487
- : ${PKG_LUA_VERSION:=5.3.3};
486
+ : ${PKG_LUA_SHA256SUM:=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c};
487
+ : ${PKG_LUA_VERSION:=5.3.4};
488
488
: ${PKG_LUA_URL:=https://www.lua.org/ftp/lua-${PKG_LUA_VERSION}.tar.gz};
489
489
: ${PKG_LUA_IN_TREE:=1};
490
- : ${PKG_LUA_MAKE_INSTALL_VNAME:=INSTALL_TOP};
491
- : ${PKG_LUA_MAKEFLAGS_BUILD_EXTRA:="CC=${DEFAULT_TARGET}-gcc midipix"};
490
+ : ${PKG_LUA_CONFIGURE_ARGS_EXTRA:="--with-readline --with-compat-module"};
491
+ : ${PKG_LUA_MAKEFLAGS_BUILD_EXTRA:="LIBS='-lm -ldl'"};
492
492
: ${PKG_NCURSES_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260};
493
493
: ${PKG_NCURSES_VERSION:=6.0};
494
494
: ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz};

Powered by Pagure 5.13.3

SSH Hostkey/Fingerprint | Documentation | About

© Red Hat, Inc. and others.