Skip to content

Commit

Permalink
games-board/ccgo: Fixed build with sys-libs/ncurses[tinfo]
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/687278
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Lars Wendler <[email protected]>
  • Loading branch information
Lars Wendler committed Jun 3, 2019
1 parent 0575893 commit d1fd084
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
3 changes: 2 additions & 1 deletion games-board/ccgo/ccgo-0.3.6.5-r1.ebuild
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6
Expand All @@ -24,6 +24,7 @@ DEPEND="${RDEPEND}

PATCHES=(
"${FILESDIR}"/${P}-gcc4.patch
"${FILESDIR}"/${P}-tinfo.patch
)

src_prepare() {
Expand Down
35 changes: 35 additions & 0 deletions games-board/ccgo/files/ccgo-0.3.6.5-tinfo.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
https://bugs.gentoo.org/687278

--- ccgo-0.3.6.5/configure.ac
+++ ccgo-0.3.6.5/configure.ac
@@ -30,7 +30,7 @@
PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gconfmm-2.6)
AC_SUBST(GTKMM_CFLAGS)
AC_SUBST(GTKMM_LIBS)
-AC_CHECK_HEADERS(ncurses.h, [have_ncurses=true], [have_ncurses=false])
+PKG_CHECK_MODULES(NCURSES, ncurses, [have_ncurses=true], [have_ncurses=false])
AM_CONDITIONAL([HAVE_NCURSES], [test x$have_ncurses = xtrue])

AM_GNU_GETTEXT([external])
--- ccgo-0.3.6.5/Makefile.am
+++ ccgo-0.3.6.5/Makefile.am
@@ -53,7 +53,7 @@
nctest_SOURCES = \
nctest.cc \
nc.cc nc.hh
-nctest_LDADD = arg.o debug.o ui/libui.a go/libgo.a -lncurses
+nctest_LDADD = arg.o debug.o ui/libui.a go/libgo.a $(NCURSES_LIBS)
endif

gtktest_SOURCES = gtktest.cc
--- ccgo-0.3.6.5/nc/Makefile.am
+++ ccgo-0.3.6.5/nc/Makefile.am
@@ -8,7 +8,7 @@
misc.cc misc.hh \
editor.cc editor.hh

-LDADD = libnc.a -lncurses
+LDADD = libnc.a $(NCURSES_LIBS)
noinst_PROGRAMS =

noinst_PROGRAMS += test-entry

0 comments on commit d1fd084

Please sign in to comment.