public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
Date: Sat, 26 Dec 2020 20:14:54 +0000 (UTC)	[thread overview]
Message-ID: <1609013691.e7f9cc1a14669e3d592e50ee8ad8ccc33ac1d692.sam@gentoo> (raw)

commit:     e7f9cc1a14669e3d592e50ee8ad8ccc33ac1d692
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 11:38:51 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 20:14:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f9cc1a

sys-libs/zlib: sync with ::prefix

Bring the prefix-only changes to the main tree.
Affected prefix platforms: cygwin/mingw.

Closes: https://bugs.gentoo.org/729940
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/zlib/Manifest              |  2 ++
 sys-libs/zlib/zlib-1.2.11-r3.ebuild | 40 +++++++++++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 1db6ff63153..9a8e50982b8 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1 +1,3 @@
+DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
+DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7

diff --git a/sys-libs/zlib/zlib-1.2.11-r3.ebuild b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
index b7ea3672a88..691432e4706 100644
--- a/sys-libs/zlib/zlib-1.2.11-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
@@ -6,15 +6,21 @@ AUTOTOOLS_AUTO_DEPEND="no"
 
 inherit autotools toolchain-funcs multilib multilib-minimal usr-ldscript
 
+CYGWINPATCHES=(
+	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
+	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch"
+)
+
 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="https://zlib.net/"
 SRC_URI="https://zlib.net/${P}.tar.gz
 	http://www.gzip.org/zlib/${P}.tar.gz
-	http://www.zlib.net/current/beta/${P}.tar.gz"
+	http://www.zlib.net/current/beta/${P}.tar.gz
+	elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="minizip static-libs"
 
 BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
@@ -29,13 +35,31 @@ PATCHES=(
 src_prepare() {
 	default
 
+	local p
+	if use elibc_Cygwin ; then
+		for p in "${CYGWINPATCHES[@]}" ; do
+			# Strip out the "... -> " from the array
+			eapply -p2 "${DISTDIR}/${p#*> }"
+		done
+	fi
+
 	if use minizip ; then
 		cd contrib/minizip || die
 		eautoreconf
 	fi
 
 	case ${CHOST} in
-	*-mingw*|mingw*)
+	*-cygwin*)
+		# do not use _wopen, is a mingw symbol only
+		sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h
+		# zlib1.dll is the mingw name, need cygz.dll
+		# cygz.dll is loaded by toolchain, put into subdir
+		sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
+		;;
+	esac
+
+	case ${CHOST} in
+	*-mingw*|mingw*|*-cygwin*)
 		# uses preconfigured Makefile rather than configure script
 		multilib_copy_sources
 		;;
@@ -46,12 +70,12 @@ echoit() { echo "$@"; "$@"; }
 
 multilib_src_configure() {
 	case ${CHOST} in
-	*-mingw*|mingw*)
+	*-mingw*|mingw*|*-cygwin*)
 		;;
 	*)
 		local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
 		local myconf=(
-			--shared
+			$(tc-is-static-only && echo "--static" || echo "--shared")
 			--prefix="${EPREFIX}/usr"
 			--libdir="${EPREFIX}/usr/$(get_libdir)"
 			${uname:+--uname=${uname}}
@@ -72,10 +96,10 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	case ${CHOST} in
-	*-mingw*|mingw*)
+	*-mingw*|mingw*|*-cygwin*)
 		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
 		sed \
-			-e 's|@prefix@|/usr|g' \
+			-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
 			-e 's|@exec_prefix@|${prefix}|g' \
 			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
 			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
@@ -98,7 +122,7 @@ sed_macros() {
 
 multilib_src_install() {
 	case ${CHOST} in
-	*-mingw*|mingw*)
+	*-mingw*|mingw*|*-cygwin*)
 		emake -f win32/Makefile.gcc install \
 			BINARY_PATH="${ED}/usr/bin" \
 			LIBRARY_PATH="${ED}/usr/$(get_libdir)" \


             reply	other threads:[~2020-12-26 20:14 UTC|newest]

Thread overview: 129+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-26 20:14 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-04  8:11 [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/ Sam James
2024-02-22 20:33 Arthur Zamarin
2024-02-06 22:44 Sam James
2024-02-06  7:25 Sam James
2024-02-06  7:25 Sam James
2024-02-06  7:25 Sam James
2024-02-06  7:25 Sam James
2024-02-06  6:54 Sam James
2024-02-06  6:25 Sam James
2024-02-06  6:25 Sam James
2024-01-06  8:04 Sam James
2024-01-03 10:40 Sam James
2023-12-17 13:50 Arthur Zamarin
2023-12-15 13:19 Arthur Zamarin
2023-12-15  7:49 Sam James
2023-12-15  7:42 Sam James
2023-12-15  7:23 Sam James
2023-12-15  7:14 Sam James
2023-11-16 16:22 Sam James
2023-11-12 16:50 Arthur Zamarin
2023-11-12  8:32 Arthur Zamarin
2023-11-12  8:20 Arthur Zamarin
2023-11-12  8:20 Arthur Zamarin
2023-11-12  8:20 Arthur Zamarin
2023-11-12  8:20 Arthur Zamarin
2023-11-12  8:20 Arthur Zamarin
2023-11-01 12:23 Arthur Zamarin
2023-11-01 12:23 Arthur Zamarin
2023-11-01 12:23 Arthur Zamarin
2023-10-30 23:09 Sam James
2023-10-30 23:09 Sam James
2023-10-30 11:29 Sam James
2023-10-30 10:52 Sam James
2023-10-30 10:52 Sam James
2023-08-19  4:39 Sam James
2023-08-18 10:37 Sam James
2023-05-27 11:05 Fabian Groffen
2023-01-14 19:17 Sam James
2022-11-22 18:43 Arthur Zamarin
2022-11-18 18:05 Arthur Zamarin
2022-11-18  4:26 Sam James
2022-11-18  4:26 Sam James
2022-11-18  4:26 Sam James
2022-11-18  4:26 Sam James
2022-11-18  4:26 Sam James
2022-11-18  4:26 Sam James
2022-10-23 10:55 Sam James
2022-09-23  2:09 Sam James
2022-08-24  5:28 Agostino Sarubbo
2022-08-24  5:27 Agostino Sarubbo
2022-08-24  4:01 Arthur Zamarin
2022-08-24  4:01 Arthur Zamarin
2022-08-24  4:01 Arthur Zamarin
2022-08-24  4:01 Arthur Zamarin
2022-08-24  1:30 Sam James
2022-08-24  1:30 Sam James
2022-06-24  9:12 Arthur Zamarin
2022-06-09  7:39 Agostino Sarubbo
2022-06-09  7:36 Agostino Sarubbo
2022-06-09  7:35 Agostino Sarubbo
2022-06-09  7:34 Agostino Sarubbo
2022-06-08  8:46 Agostino Sarubbo
2022-06-08  8:45 Agostino Sarubbo
2022-06-08  8:44 Agostino Sarubbo
2022-04-17 17:12 Sam James
2022-04-04 20:08 Jakov Smolić
2022-03-31  0:21 Sam James
2022-03-28  7:29 Sam James
2022-03-28  6:51 Sam James
2022-03-28  6:45 Sam James
2022-03-28  6:43 Sam James
2022-03-11 15:21 Sam James
2021-10-07 14:49 Mike Gilbert
2021-10-01 19:48 Mike Gilbert
2021-05-23 11:48 David Seifert
2021-05-23 11:48 David Seifert
2021-03-22  8:59 Lars Wendler
2021-03-01 18:08 Thomas Deutschmann
2021-01-26 17:42 Sergei Trofimovich
2021-01-24 23:40 Sam James
2021-01-24 15:42 Sam James
2021-01-24 13:35 Sam James
2021-01-24 13:31 Sam James
2021-01-24 13:31 Sam James
2021-01-24 12:10 Agostino Sarubbo
2021-01-24 11:58 Agostino Sarubbo
2021-01-24  1:42 Sam James
2021-01-06 15:35 Fabian Groffen
2020-12-27  9:20 Fabian Groffen
2020-12-26 20:42 Sam James
2020-12-26 20:26 Sam James
2020-10-27 19:25 Lars Wendler
2019-05-03 23:43 Mikle Kolyada
2019-04-11 11:40 Lars Wendler
2018-07-15 17:36 Mikle Kolyada
2018-07-09 19:05 Mikle Kolyada
2018-07-02  0:49 Thomas Deutschmann
2018-07-01  9:24 Sergei Trofimovich
2018-07-01  8:51 Sergei Trofimovich
2018-06-30 19:03 Sergei Trofimovich
2018-06-29  6:52 Sergei Trofimovich
2018-06-28 18:53 Sergei Trofimovich
2018-06-28 12:31 Mart Raudsepp
2018-06-28 12:01 Mikle Kolyada
2018-01-09 23:06 Mike Frysinger
2017-10-23 18:01 Markus Meier
2017-10-11 14:41 Sergei Trofimovich
2017-10-03 10:26 Thomas Deutschmann
2017-10-03  8:25 Sergei Trofimovich
2017-10-02 14:04 Manuel Rüger
2017-10-02 13:24 Sergei Trofimovich
2017-10-02 13:24 Sergei Trofimovich
2017-09-09 21:07 Lars Wendler
2017-09-09 21:07 Lars Wendler
2017-05-30  8:09 Lars Wendler
2017-05-23 14:30 Patrice Clement
2017-01-17 20:38 Mike Frysinger
2017-01-16 16:50 Lars Wendler
2017-01-16 15:54 Jeroen Roovers
2017-01-16 15:28 Agostino Sarubbo
2017-01-16  9:58 Lars Wendler
2017-01-15 22:10 Tobias Klausmann
2017-01-15 12:57 Markus Meier
2017-01-14 13:37 Jeroen Roovers
2017-01-11 11:13 Aaron Bauman
2017-01-10  8:29 Lars Wendler
2017-01-03  7:26 Lars Wendler
2017-01-01 17:10 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1609013691.e7f9cc1a14669e3d592e50ee8ad8ccc33ac1d692.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox