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 F2BB7139085 for ; Wed, 25 Jan 2017 17:56:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B6F9E0D1F; Wed, 25 Jan 2017 17:56:47 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08CB2E0D1F for ; Wed, 25 Jan 2017 17:56:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95D5234106E for ; Wed, 25 Jan 2017 17:56:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37FFE2F37 for ; Wed, 25 Jan 2017 17:56:43 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1485366996.1eefd32dcd153682ad38bfe258295d93a67deb04.grobian@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.19.ebuild X-VCS-Directories: dev-db/lmdb/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 1eefd32dcd153682ad38bfe258295d93a67deb04 X-VCS-Branch: master Date: Wed, 25 Jan 2017 17:56:43 +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: 87e845f2-f9c5-4758-bd05-eb63b5332bf4 X-Archives-Hash: a7c240640640da85b79c4c49c17c9af9 commit: 1eefd32dcd153682ad38bfe258295d93a67deb04 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 25 17:56:23 2017 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 25 17:56:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eefd32d dev-db/lmdb: add support for and keyword ~*-macos Package-Manager: portage-2.3.3 dev-db/lmdb/lmdb-0.9.19.ebuild | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dev-db/lmdb/lmdb-0.9.19.ebuild b/dev-db/lmdb/lmdb-0.9.19.ebuild index 9340aa2..6172bb1 100644 --- a/dev-db/lmdb/lmdb-0.9.19.ebuild +++ b/dev-db/lmdb/lmdb-0.9.19.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit toolchain-funcs flag-o-matic +inherit toolchain-funcs flag-o-matic multilib DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store" HOMEPAGE="http://symas.com/mdb/" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz" LICENSE="OPENLDAP" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="static-libs" DEPEND="" @@ -21,12 +21,16 @@ 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 -Wl,-soname,liblmdb.so.0!" \ + -e "s!shared!shared ${soname}!" \ "${S}/Makefile" || die eapply_user } @@ -45,8 +49,9 @@ src_compile() { src_install() { emake DESTDIR="${D}" install - mv "${ED}"usr/$(get_libdir)/liblmdb.so{,.0} || die - dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so + mv "${ED}"usr/$(get_libdir)/liblmdb$(get_libname) \ + "${ED}"usr/$(get_libdir)/liblmdb$(get_libname 0) || die + dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname) use static-libs || rm "${ED}"usr/$(get_libdir)/liblmdb.a || die }