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