summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-02-17 13:13:16 -0500
committerMike Frysinger <vapier@gentoo.org>2016-02-17 13:42:26 -0500
commita18c23fc46121edde7c4314bdf6a49b67daf424e (patch)
treea9cb1209ebc9a58204cb91ea50014bc35c6b1cc0 /dev-libs/ustr
parentmedia-libs/openh264: version bump (diff)
downloadgentoo-a18c23fc46121edde7c4314bdf6a49b67daf424e.tar.gz
gentoo-a18c23fc46121edde7c4314bdf6a49b67daf424e.tar.bz2
gentoo-a18c23fc46121edde7c4314bdf6a49b67daf424e.zip
dev-libs/ustr: unify emake calls
Also fix $EPREFIX usage in more paths, and respect CPPFLAGS settings.
Diffstat (limited to 'dev-libs/ustr')
-rw-r--r--dev-libs/ustr/ustr-1.0.4-r7.ebuild35
1 files changed, 13 insertions, 22 deletions
diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
index d89800819504..eaf650bd1c20 100644
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
@@ -26,38 +26,29 @@ src_prepare() {
multilib_copy_sources
}
-multilib_src_compile() {
+_emake() {
emake \
AR="$(tc-getAR)" \
CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
prefix="${EPREFIX}/usr" \
- SHRDIR="/usr/share/${P}" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ mandir="${EPREFIX}/usr/share/man" \
+ SHRDIR="${EPREFIX}/usr/share/${P}" \
+ DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
HIDE= \
- all-shared
+ "$@"
+}
+
+multilib_src_compile() {
+ _emake all-shared
}
multilib_src_install() {
- emake \
- DESTDIR="${D}" \
- prefix="${EPREFIX}/usr" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- mandir="/usr/share/man" \
- SHRDIR="/usr/share/${P}" \
- DOCSHRDIR="/usr/share/doc/${PF}" \
- HIDE= \
- install
+ _emake DESTDIR="${D}" install
}
multilib_src_test() {
- emake \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- prefix="${EPREFIX}/usr" \
- SHRDIR="/usr/share/${P}" \
- HIDE= \
- check
+ _emake check
}