1 |
commit: d55f1223957344dd8aaa16d5f609b46d7d2b598e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 28 06:43:11 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 28 06:43:26 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55f1223 |
7 |
|
8 |
sys-libs/zlib: add 1.2.12 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/835958 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
sys-libs/zlib/Manifest | 2 + |
14 |
sys-libs/zlib/zlib-1.2.12.ebuild | 187 +++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 189 insertions(+) |
16 |
|
17 |
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest |
18 |
index 9a8e50982b8b..fda947e4d9d9 100644 |
19 |
--- a/sys-libs/zlib/Manifest |
20 |
+++ b/sys-libs/zlib/Manifest |
21 |
@@ -1,3 +1,5 @@ |
22 |
DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a |
23 |
DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae |
24 |
+DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B 76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67 SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 |
25 |
+DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c SHA512 5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153 |
26 |
DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7 |
27 |
|
28 |
diff --git a/sys-libs/zlib/zlib-1.2.12.ebuild b/sys-libs/zlib/zlib-1.2.12.ebuild |
29 |
new file mode 100644 |
30 |
index 000000000000..88872d40aa55 |
31 |
--- /dev/null |
32 |
+++ b/sys-libs/zlib/zlib-1.2.12.ebuild |
33 |
@@ -0,0 +1,187 @@ |
34 |
+# Copyright 1999-2022 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+AUTOTOOLS_AUTO_DEPEND="no" |
40 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc |
41 |
+inherit autotools multilib-minimal usr-ldscript verify-sig |
42 |
+ |
43 |
+CYGWINPATCHES=( |
44 |
+ "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch" |
45 |
+ "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch" |
46 |
+) |
47 |
+ |
48 |
+DESCRIPTION="Standard (de)compression library" |
49 |
+HOMEPAGE="https://zlib.net/" |
50 |
+SRC_URI="https://zlib.net/${P}.tar.gz |
51 |
+ https://www.gzip.org/zlib/${P}.tar.gz |
52 |
+ https://www.zlib.net/current/beta/${P}.tar.gz |
53 |
+ verify-sig? ( https://zlib.net/${P}.tar.gz.asc ) |
54 |
+ elibc_Cygwin? ( ${CYGWINPATCHES[*]} )" |
55 |
+ |
56 |
+LICENSE="ZLIB" |
57 |
+SLOT="0/1" # subslot = SONAME |
58 |
+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" |
59 |
+IUSE="minizip static-libs" |
60 |
+ |
61 |
+# See bug #309623 for libxml2 |
62 |
+RDEPEND=" |
63 |
+ !<dev-libs/libxml2-2.7.7 |
64 |
+ !sys-libs/zlib-ng[compat] |
65 |
+" |
66 |
+DEPEND="${RDEPEND}" |
67 |
+BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} ) |
68 |
+ verify-sig? ( sec-keys/openpgp-keys-madler )" |
69 |
+ |
70 |
+PATCHES=( |
71 |
+ # bug #658536 |
72 |
+ "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch |
73 |
+ |
74 |
+ # bug #831628 |
75 |
+ "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch |
76 |
+) |
77 |
+ |
78 |
+src_prepare() { |
79 |
+ default |
80 |
+ |
81 |
+ if use elibc_Cygwin ; then |
82 |
+ local p |
83 |
+ for p in "${CYGWINPATCHES[@]}" ; do |
84 |
+ # Strip out the "... -> " from the array |
85 |
+ eapply -p2 "${DISTDIR}/${p#*> }" |
86 |
+ done |
87 |
+ fi |
88 |
+ |
89 |
+ if use minizip ; then |
90 |
+ cd contrib/minizip || die |
91 |
+ eautoreconf |
92 |
+ fi |
93 |
+ |
94 |
+ case ${CHOST} in |
95 |
+ *-cygwin*) |
96 |
+ # Do not use _wopen, it's a mingw-only symbol |
97 |
+ sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die |
98 |
+ |
99 |
+ # zlib1.dll is the mingw name, need cygz.dll |
100 |
+ # cygz.dll is loaded by toolchain, put into subdir |
101 |
+ sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die |
102 |
+ |
103 |
+ ;; |
104 |
+ esac |
105 |
+ |
106 |
+ case ${CHOST} in |
107 |
+ *-mingw*|mingw*|*-cygwin*) |
108 |
+ # Uses preconfigured Makefile rather than configure script |
109 |
+ multilib_copy_sources |
110 |
+ |
111 |
+ ;; |
112 |
+ esac |
113 |
+} |
114 |
+ |
115 |
+echoit() { echo "$@"; "$@"; } |
116 |
+ |
117 |
+multilib_src_configure() { |
118 |
+ case ${CHOST} in |
119 |
+ *-mingw*|mingw*|*-cygwin*) |
120 |
+ ;; |
121 |
+ |
122 |
+ *) |
123 |
+ # bug #347167 |
124 |
+ local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) |
125 |
+ local myconf=( |
126 |
+ --shared |
127 |
+ --prefix="${EPREFIX}/usr" |
128 |
+ --libdir="${EPREFIX}/usr/$(get_libdir)" |
129 |
+ ${uname:+--uname=${uname}} |
130 |
+ ) |
131 |
+ |
132 |
+ # Not an autoconf script, so can't use econf |
133 |
+ echoit "${S}"/configure "${myconf[@]}" || die |
134 |
+ |
135 |
+ ;; |
136 |
+ esac |
137 |
+ |
138 |
+ if use minizip ; then |
139 |
+ local minizipdir="contrib/minizip" |
140 |
+ mkdir -p "${BUILD_DIR}/${minizipdir}" || die |
141 |
+ |
142 |
+ cd ${minizipdir} || die |
143 |
+ ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static) |
144 |
+ fi |
145 |
+} |
146 |
+ |
147 |
+multilib_src_compile() { |
148 |
+ case ${CHOST} in |
149 |
+ *-mingw*|mingw*|*-cygwin*) |
150 |
+ emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- |
151 |
+ sed \ |
152 |
+ -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ |
153 |
+ -e 's|@exec_prefix@|${prefix}|g' \ |
154 |
+ -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ |
155 |
+ -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ |
156 |
+ -e 's|@includedir@|${prefix}/include|g' \ |
157 |
+ -e 's|@VERSION@|'${PV}'|g' \ |
158 |
+ zlib.pc.in > zlib.pc || die |
159 |
+ ;; |
160 |
+ |
161 |
+ *) |
162 |
+ emake |
163 |
+ |
164 |
+ ;; |
165 |
+ esac |
166 |
+ |
167 |
+ use minizip && emake -C contrib/minizip |
168 |
+} |
169 |
+ |
170 |
+sed_macros() { |
171 |
+ # Clean up namespace a little, bug #383179 |
172 |
+ # We do it here so we only have to tweak 2 files |
173 |
+ sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die |
174 |
+} |
175 |
+ |
176 |
+multilib_src_install() { |
177 |
+ case ${CHOST} in |
178 |
+ *-mingw*|mingw*|*-cygwin*) |
179 |
+ emake -f win32/Makefile.gcc install \ |
180 |
+ BINARY_PATH="${ED}/usr/bin" \ |
181 |
+ LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ |
182 |
+ INCLUDE_PATH="${ED}/usr/include" \ |
183 |
+ SHARED_MODE=1 |
184 |
+ |
185 |
+ # Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136 |
186 |
+ insinto /usr/$(get_libdir)/pkgconfig |
187 |
+ doins zlib.pc |
188 |
+ |
189 |
+ ;; |
190 |
+ |
191 |
+ *) |
192 |
+ emake install DESTDIR="${D}" LDCONFIG=: |
193 |
+ gen_usr_ldscript -a z |
194 |
+ |
195 |
+ ;; |
196 |
+ esac |
197 |
+ |
198 |
+ sed_macros "${ED}"/usr/include/*.h |
199 |
+ |
200 |
+ if use minizip ; then |
201 |
+ emake -C contrib/minizip install DESTDIR="${D}" |
202 |
+ sed_macros "${ED}"/usr/include/minizip/*.h |
203 |
+ fi |
204 |
+ |
205 |
+ if use minizip; then |
206 |
+ # This might not exist if slibtool is used. |
207 |
+ # bug #816756 |
208 |
+ rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die |
209 |
+ fi |
210 |
+ |
211 |
+ if ! use static-libs ; then |
212 |
+ # bug #419645 |
213 |
+ rm "${ED}"/usr/$(get_libdir)/libz.a || die |
214 |
+ fi |
215 |
+} |
216 |
+ |
217 |
+multilib_src_install_all() { |
218 |
+ dodoc FAQ README ChangeLog doc/*.txt |
219 |
+ use minizip && dodoc contrib/minizip/*.txt |
220 |
+} |