Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/coreutils/
Date: Tue, 28 Dec 2021 15:29:51
Message-Id: 1640705335.f7fb3c000689f3cd63cb8e3af8fb60b6088996d7.grobian@gentoo
1 commit: f7fb3c000689f3cd63cb8e3af8fb60b6088996d7
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 28 15:28:55 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 28 15:28:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f7fb3c00
7
8 sys-apps/coreutils-9.0: fix/update stdbuf darwin bootstrap workaround
9
10 Package-Manager: Portage-3.0.21-prefix, Repoman-3.0.3
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 sys-apps/coreutils/coreutils-9.0-r2.ebuild | 20 ++++++++++----------
14 1 file changed, 10 insertions(+), 10 deletions(-)
15
16 diff --git a/sys-apps/coreutils/coreutils-9.0-r2.ebuild b/sys-apps/coreutils/coreutils-9.0-r2.ebuild
17 index 5d2550bf69..1774109986 100644
18 --- a/sys-apps/coreutils/coreutils-9.0-r2.ebuild
19 +++ b/sys-apps/coreutils/coreutils-9.0-r2.ebuild
20 @@ -84,16 +84,16 @@ src_prepare() {
21
22 # fixup libstdbuf non-libtool stuff
23 if [[ ${CHOST} == *-darwin* ]] ; then
24 - if [[ ${CHOST} == *-darwin9* ]] ; then
25 - # we need replacement libs from libcoreutils.a here in order
26 - # to finish the linking
27 - sed -i \
28 - -e "/src_libstdbuf_so_LDADD/s:$: lib/libcoreutils.a:" \
29 - Makefile.in \
30 - || die
31 - # and we need serial building :(
32 - export MAKEOPTS+=" -j1"
33 - fi
34 + # we need replacement libs from libcoreutils.a here in order
35 + # to finish the linking (they try to avoid this, but it doesn't
36 + # during bootstrap, a re-install is fine though)
37 + sed -i \
38 + -e "/src_libstdbuf_so_LDADD/s:$: lib/libcoreutils.a:" \
39 + Makefile.in \
40 + || die
41 + # and we need serial building :(
42 + export MAKEOPTS+=" -j1"
43 + # set a proper install_name
44 sed -i \
45 -e "/src_libstdbuf_so_LDFLAGS = -shared/s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/libexec/coreutils/libstdbuf.dylib:" \
46 Makefile.in \