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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B4744158086 for ; Tue, 28 Dec 2021 15:29:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B400B2BC028; Tue, 28 Dec 2021 15:29:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54E4E2BC013 for ; Tue, 28 Dec 2021 15:29:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7859342EB3 for ; Tue, 28 Dec 2021 15:29:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 009761DA for ; Tue, 28 Dec 2021 15:29:43 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1640705335.f7fb3c000689f3cd63cb8e3af8fb60b6088996d7.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/coreutils/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: sys-apps/coreutils/coreutils-9.0-r2.ebuild X-VCS-Directories: sys-apps/coreutils/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: f7fb3c000689f3cd63cb8e3af8fb60b6088996d7 X-VCS-Branch: master Date: Tue, 28 Dec 2021 15:29:43 +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: 444b8b25-7041-45b7-97c1-743bd088ffcc X-Archives-Hash: f5439d730f83d111a4532929c5931b98 commit: f7fb3c000689f3cd63cb8e3af8fb60b6088996d7 Author: Fabian Groffen gentoo org> AuthorDate: Tue Dec 28 15:28:55 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Dec 28 15:28:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f7fb3c00 sys-apps/coreutils-9.0: fix/update stdbuf darwin bootstrap workaround Package-Manager: Portage-3.0.21-prefix, Repoman-3.0.3 Signed-off-by: Fabian Groffen gentoo.org> sys-apps/coreutils/coreutils-9.0-r2.ebuild | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys-apps/coreutils/coreutils-9.0-r2.ebuild b/sys-apps/coreutils/coreutils-9.0-r2.ebuild index 5d2550bf69..1774109986 100644 --- a/sys-apps/coreutils/coreutils-9.0-r2.ebuild +++ b/sys-apps/coreutils/coreutils-9.0-r2.ebuild @@ -84,16 +84,16 @@ src_prepare() { # fixup libstdbuf non-libtool stuff if [[ ${CHOST} == *-darwin* ]] ; then - if [[ ${CHOST} == *-darwin9* ]] ; then - # we need replacement libs from libcoreutils.a here in order - # to finish the linking - sed -i \ - -e "/src_libstdbuf_so_LDADD/s:$: lib/libcoreutils.a:" \ - Makefile.in \ - || die - # and we need serial building :( - export MAKEOPTS+=" -j1" - fi + # we need replacement libs from libcoreutils.a here in order + # to finish the linking (they try to avoid this, but it doesn't + # during bootstrap, a re-install is fine though) + sed -i \ + -e "/src_libstdbuf_so_LDADD/s:$: lib/libcoreutils.a:" \ + Makefile.in \ + || die + # and we need serial building :( + export MAKEOPTS+=" -j1" + # set a proper install_name sed -i \ -e "/src_libstdbuf_so_LDFLAGS = -shared/s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/libexec/coreutils/libstdbuf.dylib:" \ Makefile.in \