| 1 |
commit: 0bdb2489027a808f33a4c4c95c3ae16ce9ef3d89 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 30 14:50:41 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 30 14:50:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bdb2489 |
| 7 |
|
| 8 |
sys-libs/talloc: fix Darwin build |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.10.2-prefix, Repoman-3.0.2 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-libs/talloc/talloc-2.3.1.ebuild | 37 +++++++++++++++++++++++++++++-------- |
| 14 |
1 file changed, 29 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild |
| 17 |
index ec25e7966a9..e6dbe274fd6 100644 |
| 18 |
--- a/sys-libs/talloc/talloc-2.3.1.ebuild |
| 19 |
+++ b/sys-libs/talloc/talloc-2.3.1.ebuild |
| 20 |
@@ -53,6 +53,13 @@ pkg_setup() { |
| 21 |
src_prepare() { |
| 22 |
default |
| 23 |
|
| 24 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 25 |
+ # Drop irritating ABI names (e.g. cpython-37m) |
| 26 |
+ # We're only installing one implementation anyway |
| 27 |
+ sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die |
| 28 |
+ sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die |
| 29 |
+ fi |
| 30 |
+ |
| 31 |
# what would you expect of waf? i won't even waste time trying. |
| 32 |
multilib_copy_sources |
| 33 |
} |
| 34 |
@@ -78,19 +85,33 @@ multilib_src_install() { |
| 35 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 36 |
install_name_tool \ |
| 37 |
-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ |
| 38 |
- "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die |
| 39 |
+ "${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die |
| 40 |
+ |
| 41 |
if use python ; then |
| 42 |
install_name_tool \ |
| 43 |
-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \ |
| 44 |
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die |
| 45 |
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die |
| 46 |
+ install_name_tool \ |
| 47 |
+ -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ |
| 48 |
+ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ |
| 49 |
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die |
| 50 |
+ |
| 51 |
+ install_name_tool \ |
| 52 |
+ -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \ |
| 53 |
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die |
| 54 |
+ install_name_tool \ |
| 55 |
+ -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ |
| 56 |
+ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ |
| 57 |
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die |
| 58 |
+ |
| 59 |
install_name_tool \ |
| 60 |
- -change "${S}/bin/default/libtalloc.dylib" \ |
| 61 |
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ |
| 62 |
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die |
| 63 |
+ -change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \ |
| 64 |
+ "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \ |
| 65 |
+ "${D}"$(python_get_sitedir)/talloc*.bundle || die |
| 66 |
install_name_tool \ |
| 67 |
- -change "${S}/bin/default/libtalloc.dylib" \ |
| 68 |
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ |
| 69 |
- "${D}"$(python_get_sitedir)/talloc.bundle || die |
| 70 |
+ -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ |
| 71 |
+ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ |
| 72 |
+ "${D}"$(python_get_sitedir)/talloc*.bundle || die |
| 73 |
fi |
| 74 |
fi |
| 75 |
} |
Archives