diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2019-08-26 12:22:05 +0300 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2019-08-26 12:22:16 +0300 |
commit | 14cef62fae592faa1c943157d235410d361f586a (patch) | |
tree | 878e53f53430db5cbee29a3be9f8401c45f6e944 /app-misc/clockywock | |
parent | dev-libs/weston: Drop old 6.0.* (diff) | |
download | gentoo-14cef62fae592faa1c943157d235410d361f586a.tar.gz gentoo-14cef62fae592faa1c943157d235410d361f586a.tar.bz2 gentoo-14cef62fae592faa1c943157d235410d361f586a.zip |
app-misc/clockywock: fix building with separate tinfo library
Also bump EAPI to 7
Closes: https://bugs.gentoo.org/690008
Reported-by: Toralf Förster <toralf@gentoo.org>
Signed-off-by: Sergey Popov <pinkbyte@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Diffstat (limited to 'app-misc/clockywock')
-rw-r--r-- | app-misc/clockywock/clockywock-0.3.1a.ebuild | 8 | ||||
-rw-r--r-- | app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app-misc/clockywock/clockywock-0.3.1a.ebuild b/app-misc/clockywock/clockywock-0.3.1a.ebuild index 26f1be9445c7..1477cdb488e8 100644 --- a/app-misc/clockywock/clockywock-0.3.1a.ebuild +++ b/app-misc/clockywock/clockywock-0.3.1a.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs @@ -14,7 +14,9 @@ SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" RDEPEND="sys-libs/ncurses:0=" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig +" PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) diff --git a/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch index e6f5bd510dc3..cb1521947a7c 100644 --- a/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch +++ b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch @@ -1,7 +1,8 @@ --- a/Makefile +++ b/Makefile -@@ -1,5 +1,6 @@ -+LIBS += -lncurses -lpthread +@@ -1,5 +1,7 @@ ++PKGCONFIG ?= pkg-config ++LIBS += $(shell $(PKGCONFIG) --libs ncurses) -lpthread all: - g++ -O3 -Wall -o clockywock clockywock.cpp -lncurses -lpthread + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o clockywock clockywock.cpp $(LIBS) |