From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46BBA1382C5 for ; Sun, 25 Feb 2018 16:20:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CC1AE086B; Sun, 25 Feb 2018 16:20:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48850E086B for ; Sun, 25 Feb 2018 16:20:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90517335C54 for ; Sun, 25 Feb 2018 16:20:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA70722D for ; Sun, 25 Feb 2018 16:20:08 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1519575585.d4df6c3792af4f37875e8a1a215e394e4f49b8ae.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/vcp/, app-misc/vcp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/vcp/files/vcp-2.2-tinfo.patch app-misc/vcp/vcp-2.2-r2.ebuild X-VCS-Directories: app-misc/vcp/files/ app-misc/vcp/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: d4df6c3792af4f37875e8a1a215e394e4f49b8ae X-VCS-Branch: master Date: Sun, 25 Feb 2018 16:20:08 +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: 8cb1b83e-17a7-4ae5-8956-d8bbc1542e89 X-Archives-Hash: 4c47a6167217d457a429d94ee0b78b74 commit: d4df6c3792af4f37875e8a1a215e394e4f49b8ae Author: Jeroen Roovers gentoo org> AuthorDate: Sun Feb 25 16:19:45 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Feb 25 16:19:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4df6c37 app-misc/vcp: Fix compiling against sys-libs/ncurses[tinfo] (bug #633744). Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-misc/vcp/files/vcp-2.2-tinfo.patch | 11 +++++++++++ app-misc/vcp/vcp-2.2-r2.ebuild | 10 ++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app-misc/vcp/files/vcp-2.2-tinfo.patch b/app-misc/vcp/files/vcp-2.2-tinfo.patch new file mode 100644 index 00000000000..715b6f1a658 --- /dev/null +++ b/app-misc/vcp/files/vcp-2.2-tinfo.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ + OBJS = main.o copyall.o copy.o screen.o log.o path.o misc.o color.o + + all: $(OBJS) +- $(CC) $(CFLAGS) -o vcp $(OBJS) -lcurses ++ $(CC) $(CFLAGS) $(LDFLAGS) -o vcp $(OBJS) $(shell $(PKG_CONFIG) --libs ncurses) + + .c.o: + $(CC) $(CFLAGS) -c -I/usr/include/ -o $@ $< diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild index a7d1a6493b6..469e80c56dd 100644 --- a/app-misc/vcp/vcp-2.2-r2.ebuild +++ b/app-misc/vcp/vcp-2.2-r2.ebuild @@ -17,15 +17,13 @@ DEPEND="sys-libs/ncurses:0=" RDEPEND="${DEPEND}" DOCS=( Changelog README INSTALL ) - -src_prepare() { - default - sed -i Makefile -e '/-o vcp/s|$(CFLAGS)|& $(LDFLAGS)|' || die "sed Makefile" -} +PATCHES=( + "${FILESDIR}"/${PN}-2.2-tinfo.patch +) src_compile() { filter-lfs-flags - emake CC="$(tc-getCC)" + emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" } src_install() {