From 084e3e42a4a894e329a9c8115c3dec664f3bc38b Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 15 Mar 2019 16:27:13 +0100
Subject: dev-libs/olm: Multiple build improvements

- Removed "-Wall -Werror"
- Use correct libdir for installation. Mostly important for 17.1 profiles
- Use ABI-compliant CC and AR
- Override PREFIX and DESTDIR when calling emake. This way we don't need to
  replace PREFIX everywhere in the Makefile
---
 dev-libs/olm/olm-2.3.0.ebuild | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'dev-libs')

diff --git a/dev-libs/olm/olm-2.3.0.ebuild b/dev-libs/olm/olm-2.3.0.ebuild
index 68ac723..b7fd959 100644
--- a/dev-libs/olm/olm-2.3.0.ebuild
+++ b/dev-libs/olm/olm-2.3.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
 HOMEPAGE="https://git.matrix.org/git/olm/about/"
 
@@ -20,6 +22,17 @@ IUSE=""
 
 src_prepare() {
     default
+    sed \
+	    -e '/^LDFLAGS/d' \
+	    -e 's@-Wall -Werror@@' \
+	    -e "s@\$(PREFIX)/lib@\$(PREFIX)/$(get_libdir)@g" \
+	    -i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
 
-    sed -i 's@$(PREFIX)@/usr@g' Makefile
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
 }
-- 
cgit v1.2.3-65-gdbad