Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
Date: Sat, 26 Dec 2020 20:26:59
Message-Id: 1609014413.6b92c19d502ad82d828a54c95ebc5bdcf55325a4.sam@gentoo
1 commit: 6b92c19d502ad82d828a54c95ebc5bdcf55325a4
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 26 20:26:47 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 26 20:26:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b92c19d
7
8 sys-libs/zlib: add missing || die on Cygwin sed
9
10 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sys-libs/zlib/zlib-1.2.11-r3.ebuild | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/sys-libs/zlib/zlib-1.2.11-r3.ebuild b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
17 index 691432e4706..ef5a1d5a37d 100644
18 --- a/sys-libs/zlib/zlib-1.2.11-r3.ebuild
19 +++ b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
20 @@ -51,7 +51,7 @@ src_prepare() {
21 case ${CHOST} in
22 *-cygwin*)
23 # do not use _wopen, is a mingw symbol only
24 - sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h
25 + sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
26 # zlib1.dll is the mingw name, need cygz.dll
27 # cygz.dll is loaded by toolchain, put into subdir
28 sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die