1 |
commit: 91e515ab11805360a4d8a69bc5e0dbeba189984d |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 28 17:37:40 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 28 17:38:35 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e515ab |
7 |
|
8 |
sys-libs/ncurses: fix cross tic path test #558622 |
9 |
|
10 |
sys-libs/ncurses/ncurses-5.9-r101.ebuild | 4 ++-- |
11 |
sys-libs/ncurses/ncurses-6.0-r1.ebuild | 4 ++-- |
12 |
2 files changed, 4 insertions(+), 4 deletions(-) |
13 |
|
14 |
diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild |
15 |
index 00166f6..a90cf85 100644 |
16 |
--- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild |
17 |
+++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild |
18 |
@@ -146,8 +146,8 @@ do_configure() { |
19 |
fi |
20 |
# See comments in src_configure. |
21 |
if [[ ${target} != "cross" ]] ; then |
22 |
- local tic_path="${WORKDIR}/cross/progs/tic" |
23 |
- [[ -d ${tic_path} ]] && export TIC_PATH=${tic_path} |
24 |
+ local cross_path="${WORKDIR}/cross" |
25 |
+ [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" |
26 |
else |
27 |
conf+=( --with-progs ) |
28 |
fi |
29 |
|
30 |
diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild |
31 |
index a8b1c1e..977da6d 100644 |
32 |
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild |
33 |
+++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild |
34 |
@@ -159,8 +159,8 @@ do_configure() { |
35 |
fi |
36 |
# See comments in src_configure. |
37 |
if [[ ${target} != "cross" ]] ; then |
38 |
- local tic_path="${WORKDIR}/cross/progs/tic" |
39 |
- [[ -d ${tic_path} ]] && export TIC_PATH=${tic_path} |
40 |
+ local cross_path="${WORKDIR}/cross" |
41 |
+ [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" |
42 |
fi |
43 |
|
44 |
# Force bash until upstream rebuilds the configure script with a newer |