diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
| commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
| tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /sys-libs/talloc | |
| parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) | |
gentoo resync : 14.12.2020
Diffstat (limited to 'sys-libs/talloc')
| -rw-r--r-- | sys-libs/talloc/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/talloc/talloc-2.3.1.ebuild | 37 |
2 files changed, 30 insertions, 9 deletions
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest index b66c707f8fd8..a4b882f7ffbf 100644 --- a/sys-libs/talloc/Manifest +++ b/sys-libs/talloc/Manifest @@ -1,3 +1,3 @@ DIST talloc-2.3.1.tar.gz 638878 BLAKE2B 3d014a47639434c65f5dda2c51da3c6c28d5d60dbc9afdaca27b8ec903cde3433a8fa4ca33305750ff60911f7e43171d0d932d98c2d30ea38494aa532d6d9626 SHA512 064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e -EBUILD talloc-2.3.1.ebuild 2544 BLAKE2B 75b828d0b1924893beccdbfa0b530277df037ec723314d322d8c85102c222080e89fc35563752e64f12ea09c7499450a734ae48d28067db07bbcdf3264ca308d SHA512 60b0e7bd5f0e091c829b523989ff1a590b8e25d8b64e1e711dbffea96d75557b95bdd8dfbe0df583fa7342d669748dc668acf9ff91944fd0e625c1198e27329c +EBUILD talloc-2.3.1.ebuild 3429 BLAKE2B 9d549023980e9a44467dcc3f02dcc40e070229e0cd6ccaf534cdcae035690dcec05b0b02b296e5bcbe9be6242d0ca6e33212362c997ac788751dbf8c12a315ba SHA512 6bbb0c51b61a738ab9ec1a4db14d3329bb5f56533c02c54b657fda4a48e35ea7b271b07ca64a6248e2340612bd28222ad0f70587eb2cc49dfa9991cdbcf44cf2 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3 diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild index ec25e7966a92..e6dbe274fd69 100644 --- a/sys-libs/talloc/talloc-2.3.1.ebuild +++ b/sys-libs/talloc/talloc-2.3.1.ebuild @@ -53,6 +53,13 @@ pkg_setup() { src_prepare() { default + if [[ ${CHOST} == *-darwin* ]] ; then + # Drop irritating ABI names (e.g. cpython-37m) + # We're only installing one implementation anyway + sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die + sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die + fi + # what would you expect of waf? i won't even waste time trying. multilib_copy_sources } @@ -78,19 +85,33 @@ multilib_src_install() { if [[ ${CHOST} == *-darwin* ]] ; then install_name_tool \ -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die + "${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die + if use python ; then install_name_tool \ -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \ - "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die + "${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die + install_name_tool \ + -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ + "${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die + + install_name_tool \ + -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \ + "${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die + install_name_tool \ + -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ + "${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die + install_name_tool \ - -change "${S}/bin/default/libtalloc.dylib" \ - "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die + -change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \ + "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \ + "${D}"$(python_get_sitedir)/talloc*.bundle || die install_name_tool \ - -change "${S}/bin/default/libtalloc.dylib" \ - "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${D}"$(python_get_sitedir)/talloc.bundle || die + -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ + "${D}"$(python_get_sitedir)/talloc*.bundle || die fi fi } |