diff options
Diffstat (limited to 'sys-libs/zlib/zlib-1.2.13-r1.ebuild')
-rw-r--r-- | sys-libs/zlib/zlib-1.2.13-r1.ebuild | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild b/sys-libs/zlib/zlib-1.2.13-r1.ebuild index 7f3f616da88d..7f8b0bc677a9 100644 --- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild +++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild @@ -8,18 +8,12 @@ AUTOTOOLS_AUTO_DEPEND="no" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc inherit autotools multilib-minimal flag-o-matic toolchain-funcs 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.xz https://zlib.net/fossils/${P}.tar.xz https://zlib.net/current/beta/${P}.tar.xz - verify-sig? ( https://zlib.net/${P}.tar.xz.asc ) - elibc_Cygwin? ( ${CYGWINPATCHES[*]} )" + verify-sig? ( https://zlib.net/${P}.tar.xz.asc )" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME @@ -51,33 +45,13 @@ PATCHES=( 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*) + *-mingw*|mingw*) # Uses preconfigured Makefile rather than configure script multilib_copy_sources @@ -100,7 +74,7 @@ multilib_src_configure() { fi case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) + *-mingw*|mingw*) ;; *) @@ -131,7 +105,7 @@ multilib_src_configure() { multilib_src_compile() { case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) + *-mingw*|mingw*) emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- sed \ -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ @@ -160,7 +134,7 @@ sed_macros() { multilib_src_install() { case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) + *-mingw*|mingw*) emake -f win32/Makefile.gcc install \ BINARY_PATH="${ED}/usr/bin" \ LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ |