summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2018-02-25 17:19:45 +0100
committerJeroen Roovers <jer@gentoo.org>2018-02-25 17:19:45 +0100
commitd4df6c3792af4f37875e8a1a215e394e4f49b8ae (patch)
treee826bc59b199ef05684c9e64d51f3a378f3fde57 /app-misc
parentsys-apps/duc: Version 1.4.3. (diff)
downloadgentoo-d4df6c3792af4f37875e8a1a215e394e4f49b8ae.tar.gz
gentoo-d4df6c3792af4f37875e8a1a215e394e4f49b8ae.tar.bz2
gentoo-d4df6c3792af4f37875e8a1a215e394e4f49b8ae.zip
app-misc/vcp: Fix compiling against sys-libs/ncurses[tinfo] (bug #633744).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/vcp/files/vcp-2.2-tinfo.patch11
-rw-r--r--app-misc/vcp/vcp-2.2-r2.ebuild10
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() {