Gentoo Archives: gentoo-commits

From: Maxim Koltsov <maksbotan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/lmdb/
Date: Tue, 12 Jun 2018 13:25:51
Message-Id: 1528809459.4b77702ccc87959b43990a8b50253b80b1a2ea53.maksbotan@gentoo
1 commit: 4b77702ccc87959b43990a8b50253b80b1a2ea53
2 Author: Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
3 AuthorDate: Mon Jun 11 16:06:08 2018 +0000
4 Commit: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 12 13:17:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b77702c
7
8 dev-db/lmdb: Make ebuild multilib
9
10 .../{lmdb-0.9.21.ebuild => lmdb-0.9.21-r1.ebuild} | 32 ++++++++++++----------
11 1 file changed, 17 insertions(+), 15 deletions(-)
12
13 diff --git a/dev-db/lmdb/lmdb-0.9.21.ebuild b/dev-db/lmdb/lmdb-0.9.21-r1.ebuild
14 similarity index 64%
15 rename from dev-db/lmdb/lmdb-0.9.21.ebuild
16 rename to dev-db/lmdb/lmdb-0.9.21-r1.ebuild
17 index c8ac76bcd7c..4a0589b13fe 100644
18 --- a/dev-db/lmdb/lmdb-0.9.21.ebuild
19 +++ b/dev-db/lmdb/lmdb-0.9.21-r1.ebuild
20 @@ -2,7 +2,7 @@
21 # Distributed under the terms of the GNU General Public License v2
22
23 EAPI=6
24 -inherit toolchain-funcs flag-o-matic multilib
25 +inherit toolchain-funcs flag-o-matic multilib-minimal
26
27 DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
28 HOMEPAGE="http://symas.com/mdb/"
29 @@ -20,21 +20,23 @@ RDEPEND="!=net-nds/openldap-2.4.40"
30 S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
31
32 src_prepare() {
33 - local soname="-Wl,-soname,liblmdb$(get_libname 0)"
34 - [[ ${CHOST} == *-darwin* ]] && \
35 - soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
36 - sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
37 - -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
38 - -e "s!^AR.*!AR = $(tc-getAR)!" \
39 - -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
40 - -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
41 - -e "/^libdir/s!lib\$!$(get_libdir)!" \
42 - -e "s!shared!shared ${soname}!" \
43 - "${S}/Makefile" || die
44 eapply_user
45 + multilib_copy_sources
46 }
47
48 -src_configure() {
49 +multilib_src_configure() {
50 + local soname="-Wl,-soname,liblmdb$(get_libname 0)"
51 + [[ ${CHOST} == *-darwin* ]] && \
52 + soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
53 + sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
54 + -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
55 + -e "s!^AR.*!AR = $(tc-getAR)!" \
56 + -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
57 + -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
58 + -e "/^libdir/s!lib\$!$(get_libdir)!" \
59 + -e "s!shared!shared ${soname}!" \
60 + "Makefile" || die
61 +
62 if [[ ${CHOST} == *-solaris* ]] ; then
63 # ensure sigwait has a second sig argument
64 append-cppflags -D_POSIX_PTHREAD_SEMANTICS
65 @@ -43,11 +45,11 @@ src_configure() {
66 fi
67 }
68
69 -src_compile() {
70 +multilib_src_compile() {
71 emake LDLIBS+=" -pthread"
72 }
73
74 -src_install() {
75 +multilib_src_install() {
76 emake DESTDIR="${D}" install
77
78 mv "${ED}"usr/$(get_libdir)/liblmdb$(get_libname) \