From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 759F4138334 for ; Tue, 12 Jun 2018 13:25:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43D4CE0837; Tue, 12 Jun 2018 13:25:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE4B0E089B for ; Tue, 12 Jun 2018 13:25:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E88CD335C36 for ; Tue, 12 Jun 2018 13:25:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5690F2AF for ; Tue, 12 Jun 2018 13:25:46 +0000 (UTC) From: "Maxim Koltsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maxim Koltsov" Message-ID: <1528809459.4b77702ccc87959b43990a8b50253b80b1a2ea53.maksbotan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/lmdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/lmdb/lmdb-0.9.21-r1.ebuild dev-db/lmdb/lmdb-0.9.21.ebuild X-VCS-Directories: dev-db/lmdb/ X-VCS-Committer: maksbotan X-VCS-Committer-Name: Maxim Koltsov X-VCS-Revision: 4b77702ccc87959b43990a8b50253b80b1a2ea53 X-VCS-Branch: master Date: Tue, 12 Jun 2018 13:25:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c0939812-dd90-4b73-b32a-aa5aabcc1f51 X-Archives-Hash: 223ead2a0e0f288ab32a5543023adc20 commit: 4b77702ccc87959b43990a8b50253b80b1a2ea53 Author: Mike Lothian fireburn co uk> AuthorDate: Mon Jun 11 16:06:08 2018 +0000 Commit: Maxim Koltsov gentoo org> CommitDate: Tue Jun 12 13:17:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b77702c dev-db/lmdb: Make ebuild multilib .../{lmdb-0.9.21.ebuild => lmdb-0.9.21-r1.ebuild} | 32 ++++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dev-db/lmdb/lmdb-0.9.21.ebuild b/dev-db/lmdb/lmdb-0.9.21-r1.ebuild similarity index 64% rename from dev-db/lmdb/lmdb-0.9.21.ebuild rename to dev-db/lmdb/lmdb-0.9.21-r1.ebuild index c8ac76bcd7c..4a0589b13fe 100644 --- a/dev-db/lmdb/lmdb-0.9.21.ebuild +++ b/dev-db/lmdb/lmdb-0.9.21-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit toolchain-funcs flag-o-matic multilib +inherit toolchain-funcs flag-o-matic multilib-minimal DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store" HOMEPAGE="http://symas.com/mdb/" @@ -20,21 +20,23 @@ RDEPEND="!=net-nds/openldap-2.4.40" S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb" src_prepare() { - local soname="-Wl,-soname,liblmdb$(get_libname 0)" - [[ ${CHOST} == *-darwin* ]] && \ - soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)" - sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \ - -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \ - -e "s!^AR.*!AR = $(tc-getAR)!" \ - -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \ - -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \ - -e "/^libdir/s!lib\$!$(get_libdir)!" \ - -e "s!shared!shared ${soname}!" \ - "${S}/Makefile" || die eapply_user + multilib_copy_sources } -src_configure() { +multilib_src_configure() { + local soname="-Wl,-soname,liblmdb$(get_libname 0)" + [[ ${CHOST} == *-darwin* ]] && \ + soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)" + sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \ + -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \ + -e "s!^AR.*!AR = $(tc-getAR)!" \ + -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \ + -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \ + -e "/^libdir/s!lib\$!$(get_libdir)!" \ + -e "s!shared!shared ${soname}!" \ + "Makefile" || die + if [[ ${CHOST} == *-solaris* ]] ; then # ensure sigwait has a second sig argument append-cppflags -D_POSIX_PTHREAD_SEMANTICS @@ -43,11 +45,11 @@ src_configure() { fi } -src_compile() { +multilib_src_compile() { emake LDLIBS+=" -pthread" } -src_install() { +multilib_src_install() { emake DESTDIR="${D}" install mv "${ED}"usr/$(get_libdir)/liblmdb$(get_libname) \