From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1F2DF1387D3 for ; Sun, 26 Oct 2014 18:24:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E059DE0A8E; Sun, 26 Oct 2014 18:24:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E066E0A8E for ; Sun, 26 Oct 2014 18:24:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 586693403D1 for ; Sun, 26 Oct 2014 18:24:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD58B8CD7 for ; Sun, 26 Oct 2014 18:24:05 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1414346660.ba0a11fc94d303e208dd364b06c1c2a75bcdd62b.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: mk/ X-VCS-Repository: proj/openrc X-VCS-Files: mk/termcap.mk X-VCS-Directories: mk/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: ba0a11fc94d303e208dd364b06c1c2a75bcdd62b X-VCS-Branch: master Date: Sun, 26 Oct 2014 18:24:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a28b7fc1-7fec-4396-ba57-97916e12276c X-Archives-Hash: 093f677087ca0cdd3b92d61010fb1d34 commit: ba0a11fc94d303e208dd364b06c1c2a75bcdd62b Author: Johan Bergström bergstroem nu> AuthorDate: Wed Oct 22 22:59:57 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Oct 26 18:04:20 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ba0a11fc Pass ncurses cflags to build Fixes #25 Note from William Hubbs: The original patch overwrote CFLAGS. I modified this patch to add the ncurses cflags to CPPFLAGS instead of overwriting CFLAGS. --- mk/termcap.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/termcap.mk b/mk/termcap.mk index 6f590da..2d6ad01 100644 --- a/mk/termcap.mk +++ b/mk/termcap.mk @@ -1,11 +1,12 @@ ifeq (${MKTERMCAP},ncurses) - LTERMCAP:= $(shell pkg-config ncurses --libs 2> /dev/null) +TERMCAP_CFLAGS:= $(shell pkg-config ncurses --cflags 2> /dev/null) +LTERMCAP:= $(shell pkg-config ncurses --libs 2> /dev/null) ifeq ($(LTERMCAP),) LIBTERMCAP?= -lncurses else LIBTERMCAP?= $(LTERMCAP) endif -CPPFLAGS+= -DHAVE_TERMCAP +CPPFLAGS+= -DHAVE_TERMCAP ${TERMCAP_CFLAGS} LDADD+= ${LIBTERMCAP} else ifeq (${MKTERMCAP},termcap) LIBTERMCAP?= -ltermcap