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 BF1A113835A for ; Tue, 11 May 2021 20:30:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1205BE089A; Tue, 11 May 2021 20:30:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DDEA3E088D for ; Tue, 11 May 2021 20:30:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0EC0340E2B for ; Tue, 11 May 2021 20:30:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18B477F3 for ; Tue, 11 May 2021 08:44:46 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1620722677.8a3c82d2c1bac689e848c65dc0ad53e4cdd6fc7a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/apr/apr-1.6.3-r4.ebuild dev-libs/apr/apr-1.6.3-r5.ebuild dev-libs/apr/apr-1.6.5-r1.ebuild dev-libs/apr/apr-1.6.5-r2.ebuild dev-libs/apr/apr-1.7.0-r1.ebuild dev-libs/apr/apr-1.7.0-r2.ebuild X-VCS-Directories: dev-libs/apr/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8a3c82d2c1bac689e848c65dc0ad53e4cdd6fc7a X-VCS-Branch: master Date: Tue, 11 May 2021 08:44:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6a35f8de-e4ee-465b-a3de-2e1c5a9da344 X-Archives-Hash: 5922a326796d6fa275e158b5d0b2c586 commit: 8a3c82d2c1bac689e848c65dc0ad53e4cdd6fc7a Author: Sam James gentoo org> AuthorDate: Sun May 9 07:16:06 2021 +0000 Commit: Lars Wendler gentoo 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 gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/20735 Signed-off-by: Lars Wendler 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[@]}"