sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wordgrinder: fix build failure

Browse Source
This commit is contained in:
Leonid Pliushch 2020-11-22 21:07:29 +00:00
parent 6590eb5b23
commit 987338c6e6
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/wordgrinder/build.lua.patch
View File

@ -1,7 +1,7 @@
diff -uNr wordgrinder-0.7.2/build.lua wordgrinder-0.7.2.mod/build.lua diff -uNr wordgrinder-0.8/build.lua wordgrinder-0.8.mod/build.lua
--- wordgrinder-0.7.2/build.lua 2018-11-29 21:12:27.000000000 +0200 --- wordgrinder-0.8/build.lua 2020-10-23 21:48:53.000000000 +0000
+++ wordgrinder-0.7.2.mod/build.lua 2019-01-28 20:10:29.090884934 +0200 +++ wordgrinder-0.8.mod/build.lua 2020-11-22 21:00:14.905827141 +0000
@@ -496,11 +496,9 @@ @@ -549,11 +549,9 @@
if has_package(luapackage) then if has_package(luapackage) then
if want_frontend("x11") then if want_frontend("x11") then
build_wordgrinder_binary("bin/xwordgrinder", luapackage, "x11", buildstyle) build_wordgrinder_binary("bin/xwordgrinder", luapackage, "x11", buildstyle)
@ -13,7 +13,7 @@ diff -uNr wordgrinder-0.7.2/build.lua wordgrinder-0.7.2.mod/build.lua
end end
end end
end end
@@ -526,23 +524,14 @@ @@ -579,23 +577,14 @@
return binary return binary
end end
@ -37,11 +37,11 @@ diff -uNr wordgrinder-0.7.2/build.lua wordgrinder-0.7.2.mod/build.lua
install_file("755", preferred_x11, DESTDIR..BINDIR.."/xwordgrinder") install_file("755", preferred_x11, DESTDIR..BINDIR.."/xwordgrinder")
end end
install_file("644", "bin/wordgrinder.1", DESTDIR..MANDIR.."/man1/wordgrinder.1") install_file("644", "bin/wordgrinder.1", DESTDIR..MANDIR.."/man1/wordgrinder.1")
@@ -553,8 +542,7 @@ @@ -615,8 +604,7 @@
emit(" version = ", VERSION)
emit("build binaries: phony bin/wordgrinder.1 ", preferred_curses or "", " ", preferred_x11 or "", " ") emit("build binaries: phony bin/wordgrinder.1 bin/xwordgrinder.1 ",
- emit("build tests: phony ", preferred_test) preferred_curses or "", " ", preferred_x11 or "", " ")
- emit("build tests: phony ", preferred_test)
- emit("build all: phony binaries tests") - emit("build all: phony binaries tests")
+ emit("build all: phony binaries") + emit("build all: phony binaries")
emit("build install: phony all ", table.concat(installables, " ")) emit("build install: phony all ", table.concat(installables, " "))

4
packages/wordgrinder/build.sh
View File

@ -10,6 +10,10 @@ TERMUX_PKG_BUILD_IN_SRC=true
termux_step_make() { termux_step_make() {
termux_setup_ninja termux_setup_ninja
# Missing and causes install failure.
touch licenses/COPYING.LuaFileSystem
make CC=gcc OBJDIR="$PWD/build" "$PWD"/build/lua make CC=gcc OBJDIR="$PWD/build" "$PWD"/build/lua
make OBJDIR="$PWD/build" LUA_PACKAGE=lua53 make OBJDIR="$PWD/build" LUA_PACKAGE=lua53
} }