[patch] Patch zlib-1.2.11.ebuild to zlib-1.2.11-r1.ebuild

fix_zlib_on_cygwin.patch (text/plain), 1.45 KB, created by Sven Eden on 2018-01-08 16:41:15 UTC

--- a/sys-libs/zlib/zlib-1.2.11.ebuild	2017-02-20 10:43:09.000000000 +0100
+++ b/sys-libs/zlib/zlib-1.2.11-r1.ebuild	2018-01-08 15:40:27.660550500 +0100
@@ -27,8 +27,14 @@

 src_prepare() {
 	if use minizip ; then
+		case ${CHOST} in
+		*-cygwin*)
+			epatch "${FILESDIR}"/${P}-minizip-cygwin.patch
+			;;
+		esac
 		cd contrib/minizip || die
 		eautoreconf
+		cd "${S}"
 	fi

 #	epatch "${FILESDIR}"/${PN}-1.2.7-aix-soname.patch #213277
@@ -43,10 +49,7 @@
 		# 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
 		;;
@@ -57,7 +60,7 @@

 multilib_src_configure() {
 	case ${CHOST} in
-	*-mingw*|mingw*|*-cygwin*)
+	*-mingw*|mingw*)
 		;;
 	*)      # not an autoconf script, so can't use econf
 		local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
@@ -81,7 +84,7 @@

 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' \
@@ -107,7 +110,7 @@

 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)" \