| blob | f9e2a95e423683dab42a39befb57d4e06c267da5 |
1 [HACK] add preprocessed lualib file so host-lua isn't needed
3 Haserl no longer ships with haserl_lualib.inc, causing lua2c (which needs
4 host-lua support) to be built to generate it.
6 Re-add .inc file from 0.9.33 so we don't need host-lua.
8 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
9 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
10 ---
11 src/Makefile.in | 3 -
12 src/haserl_lualib.inc | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++
13 2 files changed, 98 insertions(+), 2 deletions(-)
15 Index: haserl-0.9.33/src/haserl_lualib.inc
16 ===================================================================
17 --- /dev/null
18 +++ haserl-0.9.33/src/haserl_lualib.inc
19 @@ -0,0 +1,109 @@
20 +/* This file was automatically generated from haserl_lualib.lua. DO NOT EDIT */
21 +
22 +static const unsigned char haserl_lualib[] = {
23 + 27, 76,117, 97, 81, 0, 1, 4, 8, 4, 8, 0, 19, 0, 0, 0,
24 + 0, 0, 0, 0, 64,104, 97,115,101,114,108, 95,108,117, 97,108,
25 + 105, 98, 46,108,117, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
26 + 0, 2, 7, 24, 0, 0, 0, 10, 0, 0, 0, 74, 0, 0, 0,138,
27 + 0, 0, 0,202, 0, 0, 0, 10, 1, 0, 0, 74, 1, 0, 0,138,
28 + 1, 0, 0,135,129, 1, 0, 71, 65, 1, 0, 7, 1, 1, 0,199,
29 + 192, 0, 0,135,128, 0, 0, 71, 64, 0, 0, 7, 0, 0, 0, 5,
30 + 0, 0, 0,100, 0, 0, 0, 9, 64,128,131, 5, 0, 0, 0,100,
31 + 64, 0, 0, 9, 64, 0,132, 5, 0, 0, 0,100,128, 0, 0, 9,
32 + 64,128,132, 30, 0,128, 0, 10, 0, 0, 0, 4, 7, 0, 0, 0,
33 + 0, 0, 0, 0,104, 97,115,101,114,108, 0, 4, 5, 0, 0, 0,
34 + 0, 0, 0, 0, 70, 79, 82, 77, 0, 4, 4, 0, 0, 0, 0, 0,
35 + 0, 0, 69, 78, 86, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0, 67,
36 + 79, 79, 75, 73, 69, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0, 72,
37 + 65, 83, 69, 82, 76, 0, 4, 4, 0, 0, 0, 0, 0, 0, 0, 71,
38 + 69, 84, 0, 4, 5, 0, 0, 0, 0, 0, 0, 0, 80, 79, 83, 84,
39 + 0, 4, 9, 0, 0, 0, 0, 0, 0, 0,115,101,116,102,105,101,
40 + 108,100, 0, 4, 9, 0, 0, 0, 0, 0, 0, 0,103,101,116,102,
41 + 105,101,108,100, 0, 4, 9, 0, 0, 0, 0, 0, 0, 0,109,121,
42 + 112,117,116,101,110,118, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0,
43 + 0, 0, 0, 25, 0, 0, 0, 39, 0, 0, 0, 0, 2, 0, 10, 29,
44 + 0, 0, 0,133, 0, 0, 0,197, 64, 0, 0,198,128,192, 1, 0,
45 + 1, 0, 0, 65,193, 0, 0,220, 0,129, 1, 22,128, 4,128, 5,
46 + 2, 1, 0, 64, 2, 0, 3, 28,130, 0, 1, 26, 2, 0, 0, 22,
47 + 192, 0,128, 5, 2, 1, 0, 64, 2, 0, 3, 28,130, 0, 1,128,
48 + 1, 0, 4, 23, 64,193, 3, 22,128, 1,128, 6,130, 1, 1, 26,
49 + 66, 0, 0, 22, 0, 0,128, 10, 2, 0, 0,137, 0, 2, 3,134,
50 + 128, 1, 1, 22, 0, 0,128,137, 64, 0, 3,225,128, 0, 0, 22,
51 + 128,250,127, 30, 0,128, 0, 6, 0, 0, 0, 4, 3, 0, 0, 0,
52 + 0, 0, 0, 0, 95, 71, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0,
53 + 115,116,114,105,110,103, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0,
54 + 103,109, 97,116, 99,104, 0, 4, 15, 0, 0, 0, 0, 0, 0, 0,
55 + 40, 91, 37,119, 95, 37, 45, 93, 43, 41, 40, 46, 63, 41, 0, 4,
56 + 9, 0, 0, 0, 0, 0, 0, 0,116,111,110,117,109, 98,101,114,
57 + 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0,
58 + 29, 0, 0, 0, 27, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0,
59 + 28, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0,
60 + 29, 0, 0, 0, 29, 0, 0, 0, 29, 0, 0, 0, 29, 0, 0, 0,
61 + 29, 0, 0, 0, 30, 0, 0, 0, 30, 0, 0, 0, 30, 0, 0, 0,
62 + 30, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 33, 0, 0, 0,
63 + 33, 0, 0, 0, 33, 0, 0, 0, 33, 0, 0, 0, 33, 0, 0, 0,
64 + 34, 0, 0, 0, 34, 0, 0, 0, 36, 0, 0, 0, 28, 0, 0, 0,
65 + 37, 0, 0, 0, 39, 0, 0, 0, 8, 0, 0, 0, 2, 0, 0, 0,
66 + 0, 0, 0, 0,102, 0, 0, 0, 0, 0, 28, 0, 0, 0, 2, 0,
67 + 0, 0, 0, 0, 0, 0,118, 0, 0, 0, 0, 0, 28, 0, 0, 0,
68 + 2, 0, 0, 0, 0, 0, 0, 0,116, 0, 1, 0, 0, 0, 28, 0,
69 + 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 40,102,111,114, 32,103,
70 + 101,110,101,114, 97,116,111,114, 41, 0, 6, 0, 0, 0, 28, 0,
71 + 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 40,102,111,114, 32,115,
72 + 116, 97,116,101, 41, 0, 6, 0, 0, 0, 28, 0, 0, 0, 14, 0,
73 + 0, 0, 0, 0, 0, 0, 40,102,111,114, 32, 99,111,110,116,114,
74 + 111,108, 41, 0, 6, 0, 0, 0, 28, 0, 0, 0, 2, 0, 0, 0,
75 + 0, 0, 0, 0,119, 0, 7, 0, 0, 0, 26, 0, 0, 0, 2, 0,
76 + 0, 0, 0, 0, 0, 0,100, 0, 7, 0, 0, 0, 26, 0, 0, 0,
77 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0,
78 + 47, 0, 0, 0, 0, 1, 0, 8, 12, 0, 0, 0, 69, 0, 0, 0,
79 + 133, 64, 0, 0,134,128, 64, 1,192, 0, 0, 0, 1,193, 0, 0,
80 + 156, 0,129, 1, 22, 0, 0,128, 70, 64,129, 0,161, 64, 0, 0,
81 + 22, 0,255,127, 94, 0, 0, 1, 30, 0,128, 0, 4, 0, 0, 0,
82 + 4, 3, 0, 0, 0, 0, 0, 0, 0, 95, 71, 0, 4, 7, 0, 0,
83 + 0, 0, 0, 0, 0,115,116,114,105,110,103, 0, 4, 7, 0, 0,
84 + 0, 0, 0, 0, 0,103,109, 97,116, 99,104, 0, 4, 7, 0, 0,
85 + 0, 0, 0, 0, 0, 91, 37,119, 95, 93, 43, 0, 0, 0, 0, 0,
86 + 12, 0, 0, 0, 42, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0,
87 + 43, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0,
88 + 44, 0, 0, 0, 43, 0, 0, 0, 44, 0, 0, 0, 46, 0, 0, 0,
89 + 47, 0, 0, 0, 6, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
90 + 102, 0, 0, 0, 0, 0, 11, 0, 0, 0, 2, 0, 0, 0, 0, 0,
91 + 0, 0,118, 0, 1, 0, 0, 0, 11, 0, 0, 0, 16, 0, 0, 0,
92 + 0, 0, 0, 0, 40,102,111,114, 32,103,101,110,101,114, 97,116,
93 + 111,114, 41, 0, 6, 0, 0, 0, 10, 0, 0, 0, 12, 0, 0, 0,
94 + 0, 0, 0, 0, 40,102,111,114, 32,115,116, 97,116,101, 41, 0,
95 + 6, 0, 0, 0, 10, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0,
96 + 40,102,111,114, 32, 99,111,110,116,114,111,108, 41, 0, 6, 0,
97 + 0, 0, 10, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,119, 0,
98 + 7, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
99 + 0, 0, 0, 0, 49, 0, 0, 0, 55, 0, 0, 0, 0, 2, 0, 6,
100 + 20, 0, 0, 0,133, 0, 0, 0,134, 64, 64, 1,192, 0, 0, 0,
101 + 1,129, 0, 0, 65,193, 0, 0,156,128, 0, 2, 0, 0, 0, 1,
102 + 133, 0, 0, 0,134, 64, 64, 1,192, 0, 0, 0, 1, 1, 1, 0,
103 + 65,193, 0, 0,156,128, 0, 2, 0, 0, 0, 1,133, 64, 1, 0,
104 + 134,128, 65, 1,192, 0, 0, 0, 0, 1,128, 0,156, 64,128, 1,
105 + 30, 0,128, 0, 7, 0, 0, 0, 4, 7, 0, 0, 0, 0, 0, 0,
106 + 0,115,116,114,105,110,103, 0, 4, 5, 0, 0, 0, 0, 0, 0,
107 + 0,103,115,117, 98, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0, 91,
108 + 92, 93, 92, 91, 93, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 46,
109 + 0, 4, 6, 0, 0, 0, 0, 0, 0, 0, 91, 92, 46, 93, 43, 0,
110 + 4, 7, 0, 0, 0, 0, 0, 0, 0,104, 97,115,101,114,108, 0,
111 + 4, 9, 0, 0, 0, 0, 0, 0, 0,115,101,116,102,105,101,108,
112 + 100, 0, 0, 0, 0, 0, 20, 0, 0, 0, 51, 0, 0, 0, 51, 0,
113 + 0, 0, 51, 0, 0, 0, 51, 0, 0, 0, 51, 0, 0, 0, 51, 0,
114 + 0, 0, 51, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
115 + 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0,
116 + 0, 0, 54, 0, 0, 0, 54, 0, 0, 0, 54, 0, 0, 0, 54, 0,
117 + 0, 0, 54, 0, 0, 0, 55, 0, 0, 0, 2, 0, 0, 0, 4, 0,
118 + 0, 0, 0, 0, 0, 0,107,101,121, 0, 0, 0, 0, 0, 19, 0,
119 + 0, 0, 6, 0, 0, 0, 0, 0, 0, 0,118, 97,108,117,101, 0,
120 + 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0,
121 + 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0,
122 + 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0,
123 + 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0,
124 + 23, 0, 0, 0, 23, 0, 0, 0, 25, 0, 0, 0, 39, 0, 0, 0,
125 + 25, 0, 0, 0, 41, 0, 0, 0, 47, 0, 0, 0, 41, 0, 0, 0,
126 + 49, 0, 0, 0, 55, 0, 0, 0, 49, 0, 0, 0, 55, 0, 0, 0,
127 + 0, 0, 0, 0, 0, 0, 0, 0,
128 +};
129 Index: haserl-0.9.29/src/Makefile.in
130 ===================================================================
131 --- haserl-0.9.29.orig/src/Makefile.in
132 +++ haserl-0.9.29/src/Makefile.in
133 @@ -32,7 +32,6 @@
134 NORMAL_UNINSTALL = :
135 PRE_UNINSTALL = :
136 POST_UNINSTALL = :
137 -@USE_LUA_TRUE@noinst_PROGRAMS = lua2c$(EXEEXT)
138 @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
139 @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
140 bin_PROGRAMS = haserl$(EXEEXT)
141 @@ -515,7 +514,7 @@
142 @USE_LUA_TRUE@ $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
143 @USE_LUA_TRUE@ -o $@ $^ $(LIBS)
145 -@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c
146 +@USE_LUA_TRUE@haserl_lualib.inc :
147 @USE_LUA_TRUE@ if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \
148 @USE_LUA_TRUE@ rm $@; \
149 @USE_LUA_TRUE@ exit 1 ;\