| 1 |
commit: 7e6c14e7436d5ab2a1c5ebdab28739200347b36c |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 8 10:52:39 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 8 13:45:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6c14e7 |
| 7 |
|
| 8 |
dev-db/lmdb: fix build on <=darwin9, remove upstreamed Solaris fix |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
dev-db/lmdb/lmdb-0.9.22.ebuild | 9 ++++++--- |
| 14 |
1 file changed, 6 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/lmdb/lmdb-0.9.22.ebuild b/dev-db/lmdb/lmdb-0.9.22.ebuild |
| 17 |
index 3219ba9b0b5..9e4e027f837 100644 |
| 18 |
--- a/dev-db/lmdb/lmdb-0.9.22.ebuild |
| 19 |
+++ b/dev-db/lmdb/lmdb-0.9.22.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2018 Gentoo Authors |
| 22 |
+# Copyright 1999-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
@@ -21,6 +21,11 @@ S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb" |
| 27 |
|
| 28 |
src_prepare() { |
| 29 |
eapply_user |
| 30 |
+ if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then |
| 31 |
+ # posix_memalign isn't available before 10.6, but on OSX |
| 32 |
+ # malloc is always aligned for any addressable type |
| 33 |
+ sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die |
| 34 |
+ fi |
| 35 |
multilib_copy_sources |
| 36 |
} |
| 37 |
|
| 38 |
@@ -38,8 +43,6 @@ multilib_src_configure() { |
| 39 |
"Makefile" || die |
| 40 |
|
| 41 |
if [[ ${CHOST} == *-solaris* ]] ; then |
| 42 |
- # ensure sigwait has a second sig argument |
| 43 |
- append-cppflags -D_POSIX_PTHREAD_SEMANTICS |
| 44 |
# fdatasync lives in -lrt on Solaris 10 |
| 45 |
[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt |
| 46 |
fi |
Archives