1 |
commit: 0191f0c6e66a42b6b02af337d385afa16b4f7e3b |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 23 09:36:33 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 23 09:36:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0191f0c6 |
7 |
|
8 |
sys-libs/zlib: drop ~ppc-aix |
9 |
|
10 |
Bug: https://bugs.gentoo.org/760057 |
11 |
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 |
12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
13 |
|
14 |
sys-libs/zlib/files/zlib-1.2.7-aix-soname.patch | 16 --- |
15 |
sys-libs/zlib/zlib-1.2.11-r1.ebuild | 151 ------------------------ |
16 |
sys-libs/zlib/zlib-1.2.11-r2.ebuild | 2 +- |
17 |
3 files changed, 1 insertion(+), 168 deletions(-) |
18 |
|
19 |
diff --git a/sys-libs/zlib/files/zlib-1.2.7-aix-soname.patch b/sys-libs/zlib/files/zlib-1.2.7-aix-soname.patch |
20 |
deleted file mode 100644 |
21 |
index 5f03e6e534..0000000000 |
22 |
--- a/sys-libs/zlib/files/zlib-1.2.7-aix-soname.patch |
23 |
+++ /dev/null |
24 |
@@ -1,16 +0,0 @@ |
25 |
-With a little help from my friend, the native-cctools wrapping ld to |
26 |
-support '-soname' flag on AIX, we can provide full soname support there |
27 |
-(#213277). However, this patch is not for upstream, as they cannot rely |
28 |
-on that ld wrapper: They would have to do the aix-soname magic themself |
29 |
-instead. |
30 |
- |
31 |
---- configure |
32 |
-+++ configure |
33 |
-@@ -125,6 +125,7 @@ |
34 |
- case "$uname" in |
35 |
- Linux* | linux* | GNU | GNU/* | solaris*) |
36 |
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;; |
37 |
-+ AIX* | aix* ) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"} ;; |
38 |
- *BSD | *bsd* | DragonFly) |
39 |
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} |
40 |
- LDCONFIG="ldconfig -m" ;; |
41 |
|
42 |
diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild |
43 |
deleted file mode 100644 |
44 |
index c96c3f226f..0000000000 |
45 |
--- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild |
46 |
+++ /dev/null |
47 |
@@ -1,151 +0,0 @@ |
48 |
-# Copyright 1999-2018 Gentoo Foundation |
49 |
-# Distributed under the terms of the GNU General Public License v2 |
50 |
- |
51 |
-EAPI=5 |
52 |
-AUTOTOOLS_AUTO_DEPEND="no" |
53 |
- |
54 |
-inherit autotools toolchain-funcs multilib multilib-minimal |
55 |
- |
56 |
-CYGWINPATCHES=( |
57 |
- "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch" |
58 |
- "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch" |
59 |
-) |
60 |
- |
61 |
-DESCRIPTION="Standard (de)compression library" |
62 |
-HOMEPAGE="https://zlib.net/" |
63 |
-SRC_URI="https://zlib.net/${P}.tar.gz |
64 |
- http://www.gzip.org/zlib/${P}.tar.gz |
65 |
- http://www.zlib.net/current/beta/${P}.tar.gz |
66 |
- elibc_Cygwin? ( ${CYGWINPATCHES[*]} )" |
67 |
- |
68 |
-LICENSE="ZLIB" |
69 |
-SLOT="0/1" # subslot = SONAME |
70 |
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
71 |
-IUSE="minizip static-libs" |
72 |
- |
73 |
-DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" |
74 |
-RDEPEND="abi_x86_32? ( |
75 |
- !<=app-emulation/emul-linux-x86-baselibs-20130224 |
76 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
77 |
- ) |
78 |
- !<dev-libs/libxml2-2.7.7" #309623 |
79 |
- |
80 |
-src_prepare() { |
81 |
- epatch "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch |
82 |
- |
83 |
- local p |
84 |
- use elibc_Cygwin && |
85 |
- for p in "${CYGWINPATCHES[@]}"; do |
86 |
- epatch "${DISTDIR}/${p##*/}" |
87 |
- done |
88 |
- |
89 |
- if use minizip ; then |
90 |
- pushd contrib/minizip >/dev/null || die |
91 |
- eautoreconf |
92 |
- popd >/dev/null || die |
93 |
- fi |
94 |
- |
95 |
-# epatch "${FILESDIR}"/${PN}-1.2.7-aix-soname.patch #213277 |
96 |
- |
97 |
- case ${CHOST} in |
98 |
- *-cygwin*) |
99 |
- # do not use _wopen, is a mingw symbol only |
100 |
- sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h |
101 |
- # zlib1.dll is the mingw name, need cygz.dll |
102 |
- # cygz.dll is loaded by toolchain, put into subdir |
103 |
- sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die |
104 |
- ;; |
105 |
- esac |
106 |
- |
107 |
- case ${CHOST} in |
108 |
- *-mingw*|mingw*|*-cygwin*) |
109 |
- # uses preconfigured Makefile rather than configure script |
110 |
- multilib_copy_sources |
111 |
- ;; |
112 |
- esac |
113 |
-} |
114 |
- |
115 |
-echoit() { echo "$@"; "$@"; } |
116 |
- |
117 |
-multilib_src_configure() { |
118 |
- case ${CHOST} in |
119 |
- *-mingw*|mingw*|*-cygwin*) |
120 |
- ;; |
121 |
- *) # not an autoconf script, so can't use econf |
122 |
- local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167 |
123 |
- echoit "${S}"/configure \ |
124 |
- $(tc-is-static-only && echo "--static" || echo "--shared") \ |
125 |
- --prefix="${EPREFIX}/usr" \ |
126 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
127 |
- ${uname:+--uname=${uname}} \ |
128 |
- || die |
129 |
- ;; |
130 |
- esac |
131 |
- |
132 |
- if use minizip ; then |
133 |
- local minizipdir="contrib/minizip" |
134 |
- mkdir -p "${BUILD_DIR}/${minizipdir}" || die |
135 |
- cd ${minizipdir} || die |
136 |
- ECONF_SOURCE="${S}/${minizipdir}" \ |
137 |
- econf $(use_enable static-libs static) |
138 |
- fi |
139 |
-} |
140 |
- |
141 |
-multilib_src_compile() { |
142 |
- case ${CHOST} in |
143 |
- *-mingw*|mingw*|*-cygwin*) |
144 |
- emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- |
145 |
- sed \ |
146 |
- -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ |
147 |
- -e 's|@exec_prefix@|${prefix}|g' \ |
148 |
- -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ |
149 |
- -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ |
150 |
- -e 's|@includedir@|${prefix}/include|g' \ |
151 |
- -e 's|@VERSION@|'${PV}'|g' \ |
152 |
- zlib.pc.in > zlib.pc || die |
153 |
- ;; |
154 |
- *) |
155 |
- emake |
156 |
- ;; |
157 |
- esac |
158 |
- use minizip && emake -C contrib/minizip |
159 |
-} |
160 |
- |
161 |
-sed_macros() { |
162 |
- # clean up namespace a little #383179 |
163 |
- # we do it here so we only have to tweak 2 files |
164 |
- sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die |
165 |
-} |
166 |
- |
167 |
-multilib_src_install() { |
168 |
- case ${CHOST} in |
169 |
- *-mingw*|mingw*|*-cygwin*) |
170 |
- emake -f win32/Makefile.gcc install \ |
171 |
- BINARY_PATH="${ED}/usr/bin" \ |
172 |
- LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ |
173 |
- INCLUDE_PATH="${ED}/usr/include" \ |
174 |
- SHARED_MODE=1 |
175 |
- # overwrites zlib.pc created from win32/Makefile.gcc #620136 |
176 |
- insinto /usr/$(get_libdir)/pkgconfig |
177 |
- doins zlib.pc |
178 |
- ;; |
179 |
- |
180 |
- *) |
181 |
- emake install DESTDIR="${D}" LDCONFIG=: |
182 |
- gen_usr_ldscript -a z |
183 |
- ;; |
184 |
- esac |
185 |
- sed_macros "${ED}"/usr/include/*.h |
186 |
- |
187 |
- if use minizip ; then |
188 |
- emake -C contrib/minizip install DESTDIR="${D}" |
189 |
- sed_macros "${ED}"/usr/include/minizip/*.h |
190 |
- fi |
191 |
- |
192 |
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645 |
193 |
-} |
194 |
- |
195 |
-multilib_src_install_all() { |
196 |
- dodoc FAQ README ChangeLog doc/*.txt |
197 |
- use minizip && dodoc contrib/minizip/*.txt |
198 |
-} |
199 |
|
200 |
diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild b/sys-libs/zlib/zlib-1.2.11-r2.ebuild |
201 |
index 4bdcc47b50..fb506989ef 100644 |
202 |
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild |
203 |
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild |
204 |
@@ -20,7 +20,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz |
205 |
|
206 |
LICENSE="ZLIB" |
207 |
SLOT="0/1" # subslot = SONAME |
208 |
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
209 |
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
210 |
IUSE="minizip static-libs" |
211 |
|
212 |
DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" |