From 2d83f5a06e1fd91665e69731b0bbb5978664cf8b Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 23 Sep 2017 01:49:01 +0200 Subject: [PATCH] tty-solitaire: Fix building --- packages/tty-solitaire/Makefile.patch | 31 +++++++++++++++++++++++++++++++ packages/tty-solitaire/build.sh | 4 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 packages/tty-solitaire/Makefile.patch diff --git a/packages/tty-solitaire/Makefile.patch b/packages/tty-solitaire/Makefile.patch new file mode 100644 index 00000000..39b055b1 --- /dev/null +++ b/packages/tty-solitaire/Makefile.patch @@ -0,0 +1,31 @@ +diff -u -r ../tty-solitaire-1.0.0/Makefile ./Makefile +--- ../tty-solitaire-1.0.0/Makefile 2017-01-07 23:39:19.000000000 +0100 ++++ ./Makefile 2017-09-23 01:38:01.226934201 +0200 +@@ -1,14 +1,14 @@ +-CC = gcc +-CFLAGS = -W -Wall -pedantic -ansi -std=c99 -g ++CC ?= gcc ++CFLAGS ?= -W -Wall -pedantic -ansi -std=c99 -g + +-LDFLAGS = -lncursesw ++LDFLAGS += -lncursesw + + # OS X installs ncurses with wide character support, but not as "libncurses" + ifeq ($(shell uname -s),Darwin) + LDFLAGS = -lncurses + endif + +-PREFIX = /usr/local ++PREFIX ?= /usr/local + + EXECUTABLE = ttysolitaire + SRC_DIR = src +@@ -40,7 +40,7 @@ + .PHONY: test clean install uninstall + + ttysolitaire: $(SRC_OBJECTS) +- $(CC) $(CFLAGS) $(SRC) -o $(EXECUTABLE) $(SRC_OBJECTS) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(SRC) -o $(EXECUTABLE) $(SRC_OBJECTS) $(LDFLAGS) + + test: $(SRC_OBJECTS) $(TESTS_OBJECTS) + @$(CC) $(CFLAGS) $(TESTS_SRC) -o $(TESTS_EXECUTABLE) $(TESTS_OBJECTS) $(SRC_OBJECTS) $(LDFLAGS) diff --git a/packages/tty-solitaire/build.sh b/packages/tty-solitaire/build.sh index 00253e91..41352890 100644 --- a/packages/tty-solitaire/build.sh +++ b/packages/tty-solitaire/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/mpereira/tty-solitaire -TERMUX_PKG_DESCRIPTION="ncurses-based klondike solitaire game." +TERMUX_PKG_DESCRIPTION="Klondike solitaire game" TERMUX_PKG_VERSION=1.0.0 TERMUX_PKG_SHA256=d3512beb8844ffb295cbea03bb3515fec12851bce38692e05cd55494beb2cc1f TERMUX_PKG_SRCURL=https://github.com/mpereira/tty-solitaire/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_DEPENDS="ncurses, ncurses-ui-libs, ncurses-dev" +TERMUX_PKG_DEPENDS="ncurses" -- 2.11.0