From fdc24f796e41eb4fb93d0a4f9a85a73de9ebde5c Mon Sep 17 00:00:00 2001
Message-Id: <fdc24f796e41eb4fb93d0a4f9a85a73de9ebde5c.1717302670.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 19 Jan 2017 10:25:48 +0100
Subject: [PATCH] Refactor build of tty-clock (#685)
Organization: Straylight/Edgeware

From: Oliver Schmidhauser <oli@glow.li>

---
 packages/tty-clock/Makefile.patch | 25 ++++++++++++++++---------
 packages/tty-clock/build.sh       |  6 ------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/tty-clock/Makefile.patch b/packages/tty-clock/Makefile.patch
index e8172f04..fa6c5298 100644
--- a/packages/tty-clock/Makefile.patch
+++ b/packages/tty-clock/Makefile.patch
@@ -1,14 +1,21 @@
 diff --git a/Makefile b/Makefile
-index 5028ee4..6294b23 100644
+index 5028ee4..f3ce14f 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -11,7 +11,8 @@ MANPATH = ${DESTDIR}${PREFIX}/share/man/man1
+@@ -9,16 +9,8 @@ PREFIX ?= /usr/local
+ INSTALLPATH = ${DESTDIR}${PREFIX}/bin
+ MANPATH = ${DESTDIR}${PREFIX}/share/man/man1
  
- ifeq ($(shell sh -c 'which ncurses5-config>/dev/null 2>/dev/null && echo y'), y)
- 	CFLAGS += -Wall -g $$(ncurses5-config --cflags)
+-ifeq ($(shell sh -c 'which ncurses5-config>/dev/null 2>/dev/null && echo y'), y)
+-	CFLAGS += -Wall -g $$(ncurses5-config --cflags)
 -	LDFLAGS += $$(ncurses5-config --libs)
-+	# Overwrite instead of appending LDFLAGS, because `ncurses-config --libs` also returns -ltinfo, which it can't find
-+	LDFLAGS ?= $$(ncurses5-config --libs)
- else ifeq ($(shell sh -c 'which ncursesw5-config>/dev/null 2>/dev/null && echo y'), y)
- 		CFLAGS += -Wall -g $$(ncursesw5-config --cflags)
- 		LDFLAGS += $$(ncursesw5-config --libs)
+-else ifeq ($(shell sh -c 'which ncursesw5-config>/dev/null 2>/dev/null && echo y'), y)
+-		CFLAGS += -Wall -g $$(ncursesw5-config --cflags)
+-		LDFLAGS += $$(ncursesw5-config --libs)
+-else
+ 	CFLAGS += -Wall -g $$(pkg-config --cflags ncurses)
+ 	LDFLAGS += $$(pkg-config --libs ncurses)
+-endif
+ 
+ tty-clock : ${SRC}
+ 
diff --git a/packages/tty-clock/build.sh b/packages/tty-clock/build.sh
index a8cad8f0..dca56822 100644
--- a/packages/tty-clock/build.sh
+++ b/packages/tty-clock/build.sh
@@ -5,9 +5,3 @@ TERMUX_PKG_SRCURL=https://github.com/xorg62/tty-clock/archive/v${TERMUX_PKG_VERS
 TERMUX_PKG_FOLDERNAME=tty-clock-${TERMUX_PKG_VERSION}
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_BUILD_IN_SRC=yes
-
-termux_step_post_configure() {
-    LDFLAGS+=" -lncurses"
-    CFLAGS+=" $CPPFLAGS"
-}
-
-- 
[mdw]