[patch] zlib-1.2.6.ebuild-mingw32.patch

zlib-1.2.6.ebuild-mingw32.patch (text/plain), 1.81 KB, created by Nathan Phillip Brink (binki) (RETIRED) on 2012-03-09 03:08:04 UTC

Index: zlib-1.2.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.6.ebuild,v
retrieving revision 1.1
diff -u -b -B -r1.1 zlib-1.2.6.ebuild
--- zlib-1.2.6.ebuild	30 Jan 2012 06:47:57 -0000	1.1
+++ zlib-1.2.6.ebuild	9 Mar 2012 03:05:19 -0000
@@ -23,6 +23,7 @@
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-mingw32-destdir.patch
 	if use minizip ; then
 		cd contrib/minizip
 		eautoreconf
@@ -34,14 +35,6 @@
 	case ${CHOST} in
 	*-mingw*|mingw*)
 		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die
-		sed \
-			-e 's|@prefix@|/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
 		;;
 	*)	# not an autoconf script, so can't use econf
 		echoit ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
@@ -64,13 +57,12 @@
 	case ${CHOST} in
 	*-mingw*|mingw*)
 		emake -f win32/Makefile.gcc install \
-			BINARY_PATH="${D}/usr/bin" \
-			LIBRARY_PATH="${D}/usr/$(get_libdir)" \
-			INCLUDE_PATH="${D}/usr/include" \
+			DESTDIR="${D}" \
+			BINARY_PATH="/usr/bin" \
+			LIBRARY_PATH="/usr/$(get_libdir)" \
+			INCLUDE_PATH="/usr/include" \
 			SHARED_MODE=1 \
 			|| die
-		insinto /usr/share/pkgconfig
-		doins zlib.pc || die
 		;;
 
 	*)
@@ -89,5 +81,12 @@
 		dodoc *.txt
 	fi
 
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/*.{a,la}
+	# Don't delete libz.dll.a because that's the import lib necessary
+	# for dynamic linking (on mingw32).
+	if ! use static-libs; then
+		local lib
+		for lib in "${D}"/usr/$(get_libdir)/*.{a,la}; do
+			[[ ${lib} != *.dll.a ]] && { rm -f "${lib}" || die; }
+		done
+	fi
 }