Skip to content

Commit 444844a

Browse files
authored
fix(ci): rockspec (#77)
1 parent eb66d4b commit 444844a

3 files changed

Lines changed: 8 additions & 13 deletions

File tree

.github/rockspec.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ build = {
3636
copy_directories = $copy_directories,
3737
build_variables = {
3838
LUA_INCDIR="$(LUA_INCDIR)",
39+
LIBFLAG="$(LIBFLAG)",
3940
},
4041
install_variables = {
42+
WRAP = "false",
4143
LIBDIR="$(LIBDIR)",
4244
BINDIR="$(BINDIR)",
4345
LUADIR="$(LUADIR)",

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,16 @@ ifdef LUADIR
100100
endif
101101
ifdef BINDIR
102102
@mkdir -p "$(BINDIR)";
103+
ifneq ($(WRAP),false)
103104
ifeq ($(filter /%,$(LUA)),)
104105
@echo '$(FIX_SHEBANG)' | $(LUA) - "/usr/bin/env $(LUA)" "$(abspath $(LIBDIR))" > "$(BINDIR)/tomlua"
105106
else
106107
@echo '$(FIX_SHEBANG)' | $(LUA) - "$(LUA)" "$(abspath $(LIBDIR))" > "$(BINDIR)/tomlua"
107108
endif
108109
@cat "$(SRC)/bin/tomlua" >> "$(BINDIR)/tomlua";
110+
else
111+
@cat "$(SRC)/bin/tomlua" > "$(BINDIR)/tomlua";
112+
endif
109113
@chmod +x "$(BINDIR)/tomlua";
110114
@echo "Installed binary to $(BINDIR)";
111115
endif

tomlua-scm-1.rockspec

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ build = {
2121
type = "make",
2222
build_variables = {
2323
LUA_INCDIR="$(LUA_INCDIR)",
24+
LIBFLAG="$(LIBFLAG)",
2425
},
2526
install_variables = {
27+
WRAP = "false",
2628
LIBDIR="$(LIBDIR)",
2729
BINDIR="$(BINDIR)",
2830
LUADIR="$(LUADIR)",
@@ -33,16 +35,3 @@ test = {
3335
type = "command",
3436
command = "make test",
3537
}
36-
37-
-- How do I specify CFLAGS -O3 and maybe -flto here?
38-
-- build = {
39-
-- type = "builtin",
40-
-- modules = {
41-
-- tomlua = {
42-
-- "./src/tomlua.c",
43-
-- "./src/decode.c",
44-
-- "./src/encode.c",
45-
-- "./src/dates.c",
46-
-- },
47-
-- }
48-
-- }

0 commit comments

Comments
 (0)