1 |
commit: d4df6c3792af4f37875e8a1a215e394e4f49b8ae |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 25 16:19:45 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 25 16:19:45 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4df6c37 |
7 |
|
8 |
app-misc/vcp: Fix compiling against sys-libs/ncurses[tinfo] (bug #633744). |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
app-misc/vcp/files/vcp-2.2-tinfo.patch | 11 +++++++++++ |
13 |
app-misc/vcp/vcp-2.2-r2.ebuild | 10 ++++------ |
14 |
2 files changed, 15 insertions(+), 6 deletions(-) |
15 |
|
16 |
diff --git a/app-misc/vcp/files/vcp-2.2-tinfo.patch b/app-misc/vcp/files/vcp-2.2-tinfo.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..715b6f1a658 |
19 |
--- /dev/null |
20 |
+++ b/app-misc/vcp/files/vcp-2.2-tinfo.patch |
21 |
@@ -0,0 +1,11 @@ |
22 |
+--- a/Makefile |
23 |
++++ b/Makefile |
24 |
+@@ -4,7 +4,7 @@ |
25 |
+ OBJS = main.o copyall.o copy.o screen.o log.o path.o misc.o color.o |
26 |
+ |
27 |
+ all: $(OBJS) |
28 |
+- $(CC) $(CFLAGS) -o vcp $(OBJS) -lcurses |
29 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o vcp $(OBJS) $(shell $(PKG_CONFIG) --libs ncurses) |
30 |
+ |
31 |
+ .c.o: |
32 |
+ $(CC) $(CFLAGS) -c -I/usr/include/ -o $@ $< |
33 |
|
34 |
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild |
35 |
index a7d1a6493b6..469e80c56dd 100644 |
36 |
--- a/app-misc/vcp/vcp-2.2-r2.ebuild |
37 |
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild |
38 |
@@ -17,15 +17,13 @@ DEPEND="sys-libs/ncurses:0=" |
39 |
RDEPEND="${DEPEND}" |
40 |
|
41 |
DOCS=( Changelog README INSTALL ) |
42 |
- |
43 |
-src_prepare() { |
44 |
- default |
45 |
- sed -i Makefile -e '/-o vcp/s|$(CFLAGS)|& $(LDFLAGS)|' || die "sed Makefile" |
46 |
-} |
47 |
+PATCHES=( |
48 |
+ "${FILESDIR}"/${PN}-2.2-tinfo.patch |
49 |
+) |
50 |
|
51 |
src_compile() { |
52 |
filter-lfs-flags |
53 |
- emake CC="$(tc-getCC)" |
54 |
+ emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" |
55 |
} |
56 |
|
57 |
src_install() { |