From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/
Date: Mon, 28 Mar 2022 06:43:50 +0000 (UTC) [thread overview]
Message-ID: <1648449806.d55f1223957344dd8aaa16d5f609b46d7d2b598e.sam@gentoo> (raw)
commit: d55f1223957344dd8aaa16d5f609b46d7d2b598e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 06:43:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 06:43:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55f1223
sys-libs/zlib: add 1.2.12
Bug: https://bugs.gentoo.org/835958
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/zlib/Manifest | 2 +
sys-libs/zlib/zlib-1.2.12.ebuild | 187 +++++++++++++++++++++++++++++++++++++++
2 files changed, 189 insertions(+)
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 9a8e50982b8b..fda947e4d9d9 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,3 +1,5 @@
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.12.tar.gz 1490071 BLAKE2B 76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67 SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
+DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c SHA512 5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153
DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
diff --git a/sys-libs/zlib/zlib-1.2.12.ebuild b/sys-libs/zlib/zlib-1.2.12.ebuild
new file mode 100644
index 000000000000..88872d40aa55
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.12.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+AUTOTOOLS_AUTO_DEPEND="no"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
+inherit autotools multilib-minimal usr-ldscript verify-sig
+
+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
+ https://www.gzip.org/zlib/${P}.tar.gz
+ https://www.zlib.net/current/beta/${P}.tar.gz
+ verify-sig? ( https://zlib.net/${P}.tar.gz.asc )
+ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="minizip static-libs"
+
+# See bug #309623 for libxml2
+RDEPEND="
+ !<dev-libs/libxml2-2.7.7
+ !sys-libs/zlib-ng[compat]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )
+ verify-sig? ( sec-keys/openpgp-keys-madler )"
+
+PATCHES=(
+ # bug #658536
+ "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
+
+ # bug #831628
+ "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
+)
+
+src_prepare() {
+ default
+
+ if use elibc_Cygwin ; then
+ local p
+ 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
+ *-cygwin*)
+ # Do not use _wopen, it's a mingw-only symbol
+ sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
+
+ # 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
+
+ ;;
+ esac
+}
+
+echoit() { echo "$@"; "$@"; }
+
+multilib_src_configure() {
+ case ${CHOST} in
+ *-mingw*|mingw*|*-cygwin*)
+ ;;
+
+ *)
+ # bug #347167
+ local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3)
+ local myconf=(
+ --shared
+ --prefix="${EPREFIX}/usr"
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ ${uname:+--uname=${uname}}
+ )
+
+ # Not an autoconf script, so can't use econf
+ echoit "${S}"/configure "${myconf[@]}" || die
+
+ ;;
+ esac
+
+ if use minizip ; then
+ local minizipdir="contrib/minizip"
+ mkdir -p "${BUILD_DIR}/${minizipdir}" || die
+
+ cd ${minizipdir} || die
+ ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static)
+ fi
+}
+
+multilib_src_compile() {
+ case ${CHOST} in
+ *-mingw*|mingw*|*-cygwin*)
+ emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
+ sed \
+ -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' \
+ -e 's|@includedir@|${prefix}/include|g' \
+ -e 's|@VERSION@|'${PV}'|g' \
+ zlib.pc.in > zlib.pc || die
+ ;;
+
+ *)
+ emake
+
+ ;;
+ esac
+
+ use minizip && emake -C contrib/minizip
+}
+
+sed_macros() {
+ # Clean up namespace a little, bug #383179
+ # We do it here so we only have to tweak 2 files
+ sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
+}
+
+multilib_src_install() {
+ case ${CHOST} in
+ *-mingw*|mingw*|*-cygwin*)
+ emake -f win32/Makefile.gcc install \
+ BINARY_PATH="${ED}/usr/bin" \
+ LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
+ INCLUDE_PATH="${ED}/usr/include" \
+ SHARED_MODE=1
+
+ # Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins zlib.pc
+
+ ;;
+
+ *)
+ emake install DESTDIR="${D}" LDCONFIG=:
+ gen_usr_ldscript -a z
+
+ ;;
+ esac
+
+ sed_macros "${ED}"/usr/include/*.h
+
+ if use minizip ; then
+ emake -C contrib/minizip install DESTDIR="${D}"
+ sed_macros "${ED}"/usr/include/minizip/*.h
+ fi
+
+ if use minizip; then
+ # This might not exist if slibtool is used.
+ # bug #816756
+ rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
+ fi
+
+ if ! use static-libs ; then
+ # bug #419645
+ rm "${ED}"/usr/$(get_libdir)/libz.a || die
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc FAQ README ChangeLog doc/*.txt
+ use minizip && dodoc contrib/minizip/*.txt
+}
next reply other threads:[~2022-03-28 6:43 UTC|newest]
Thread overview: 129+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 6:43 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-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-12-26 20:14 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=1648449806.d55f1223957344dd8aaa16d5f609b46d7d2b598e.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