commit: 8a3c82d2c1bac689e848c65dc0ad53e4cdd6fc7a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun May 9 07:16:06 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue May 11 08:44:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3c82d2
dev-libs/apr: fix underlinking for atomics on ppc, sparc Fixes errors in the produced library like: > undefined reference to `__sync_val_compare_and_swap_8' Forcing linkage against libatomic didn't work. May be worth investigation in future but need to get ppc and sparc working again. Closes: https://bugs.gentoo.org/740464 Signed-off-by: Sam James <sam <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/20735 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> dev-libs/apr/{apr-1.6.3-r4.ebuild => apr-1.6.3-r5.ebuild} | 8 ++++++++ dev-libs/apr/{apr-1.6.5-r1.ebuild => apr-1.6.5-r2.ebuild} | 8 ++++++++ dev-libs/apr/{apr-1.7.0-r1.ebuild => apr-1.7.0-r2.ebuild} | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r5.ebuild similarity index 93% rename from dev-libs/apr/apr-1.6.3-r4.ebuild rename to dev-libs/apr/apr-1.6.3-r5.ebuild index ce047e457b5..977176aee5c 100644 --- a/dev-libs/apr/apr-1.6.3-r4.ebuild +++ b/dev-libs/apr/apr-1.6.3-r5.ebuild @@ -109,6 +109,14 @@ src_configure() { myconf+=( --disable-nonportable-atomics ) ;; esac + else + if use ppc || use sparc; then + # Avoid libapr containing undefined references (underlinked) + # undefined reference to `__sync_val_compare_and_swap_8' + # (May be possible to fix via libatomic linkage in future?) + # bug #740464 + myconf+=( --disable-nonportable-atomics ) + fi fi econf "${myconf[@]}" diff --git a/dev-libs/apr/apr-1.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r2.ebuild similarity index 93% rename from dev-libs/apr/apr-1.6.5-r1.ebuild rename to dev-libs/apr/apr-1.6.5-r2.ebuild index 2e6c0d4627e..c7f60001d87 100644 --- a/dev-libs/apr/apr-1.6.5-r1.ebuild +++ b/dev-libs/apr/apr-1.6.5-r2.ebuild @@ -108,6 +108,14 @@ src_configure() { myconf+=( --disable-nonportable-atomics ) ;; esac + else + if use ppc || use sparc; then + # Avoid libapr containing undefined references (underlinked) + # undefined reference to `__sync_val_compare_and_swap_8' + # (May be possible to fix via libatomic linkage in future?) + # bug #740464 + myconf+=( --disable-nonportable-atomics ) + fi fi econf "${myconf[@]}" diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r2.ebuild similarity index 93% rename from dev-libs/apr/apr-1.7.0-r1.ebuild rename to dev-libs/apr/apr-1.7.0-r2.ebuild index ec551265391..8a231aa627f 100644 --- a/dev-libs/apr/apr-1.7.0-r1.ebuild +++ b/dev-libs/apr/apr-1.7.0-r2.ebuild @@ -109,6 +109,14 @@ src_configure() { myconf+=( --disable-nonportable-atomics ) ;; esac + else + if use ppc || use sparc; then + # Avoid libapr containing undefined references (underlinked) + # undefined reference to `__sync_val_compare_and_swap_8' + # (May be possible to fix via libatomic linkage in future?) + # bug #740464 + myconf+=( --disable-nonportable-atomics ) + fi fi econf "${myconf[@]}"
