[patch] New patch for zlib-1.2.11-r1.ebuild

fix_zlib_on_cygwin.patch (text/plain), 1.79 KB, created by Sven Eden on 2018-01-11 16:06:46 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-11 16:46:27.175079300 +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
@@ -42,6 +48,9 @@
 		# 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
+		# The shared libraries are installed into the binary path,
+		# so the .pc file must mirror that:
+		epatch "${FILESDIR}"/${P}-pkgconfig-cygwin.patch
 		;;
 	esac
 
@@ -83,14 +92,6 @@
 	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
@@ -109,12 +110,13 @@
 	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" \
+			prefix="${EPREFIX}/usr" \
+			exec_prefix="\${prefix}" \
+			BINARY_PATH="${ED}usr/bin" \
+			LIBRARY_PATH="${ED}usr/$(get_libdir)" \
+			INCLUDE_PATH="${ED}usr/include" \
 			SHARED_MODE=1
-		insinto /usr/share/pkgconfig
-		doins zlib.pc
+			sed -i -e "s,${ED}usr,\${prefix},g" "${ED}"usr/$(get_libdir)/pkgconfig/*.pc || die
 		;;
 
 	*)