1 |
commit: a18c23fc46121edde7c4314bdf6a49b67daf424e |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 17 18:13:16 2016 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 17 18:42:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18c23fc |
7 |
|
8 |
dev-libs/ustr: unify emake calls |
9 |
|
10 |
Also fix $EPREFIX usage in more paths, and respect CPPFLAGS settings. |
11 |
|
12 |
dev-libs/ustr/ustr-1.0.4-r7.ebuild | 35 +++++++++++++---------------------- |
13 |
1 file changed, 13 insertions(+), 22 deletions(-) |
14 |
|
15 |
diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild |
16 |
index d898008..eaf650b 100644 |
17 |
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild |
18 |
+++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild |
19 |
@@ -26,38 +26,29 @@ src_prepare() { |
20 |
multilib_copy_sources |
21 |
} |
22 |
|
23 |
-multilib_src_compile() { |
24 |
+_emake() { |
25 |
emake \ |
26 |
AR="$(tc-getAR)" \ |
27 |
CC="$(tc-getCC)" \ |
28 |
- CFLAGS="${CFLAGS}" \ |
29 |
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
30 |
LDFLAGS="${LDFLAGS}" \ |
31 |
prefix="${EPREFIX}/usr" \ |
32 |
- SHRDIR="/usr/share/${P}" \ |
33 |
+ libdir="${EPREFIX}/usr/$(get_libdir)" \ |
34 |
+ mandir="${EPREFIX}/usr/share/man" \ |
35 |
+ SHRDIR="${EPREFIX}/usr/share/${P}" \ |
36 |
+ DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \ |
37 |
HIDE= \ |
38 |
- all-shared |
39 |
+ "$@" |
40 |
+} |
41 |
+ |
42 |
+multilib_src_compile() { |
43 |
+ _emake all-shared |
44 |
} |
45 |
|
46 |
multilib_src_install() { |
47 |
- emake \ |
48 |
- DESTDIR="${D}" \ |
49 |
- prefix="${EPREFIX}/usr" \ |
50 |
- libdir="${EPREFIX}/usr/$(get_libdir)" \ |
51 |
- mandir="/usr/share/man" \ |
52 |
- SHRDIR="/usr/share/${P}" \ |
53 |
- DOCSHRDIR="/usr/share/doc/${PF}" \ |
54 |
- HIDE= \ |
55 |
- install |
56 |
+ _emake DESTDIR="${D}" install |
57 |
} |
58 |
|
59 |
multilib_src_test() { |
60 |
- emake \ |
61 |
- AR="$(tc-getAR)" \ |
62 |
- CC="$(tc-getCC)" \ |
63 |
- CFLAGS="${CFLAGS}" \ |
64 |
- LDFLAGS="${LDFLAGS}" \ |
65 |
- prefix="${EPREFIX}/usr" \ |
66 |
- SHRDIR="/usr/share/${P}" \ |
67 |
- HIDE= \ |
68 |
- check |
69 |
+ _emake check |
70 |
} |