Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 407497 | Differences between
and this patch

Collapse All | Expand All

(-)zlib-1.2.6.ebuild (-14 / +13 lines)
Lines 23-28 Link Here
23
	unpack ${A}
23
	unpack ${A}
24
	cd "${S}"
24
	cd "${S}"
25
25
26
	epatch "${FILESDIR}"/${P}-mingw32-destdir.patch
26
	if use minizip ; then
27
	if use minizip ; then
27
		cd contrib/minizip
28
		cd contrib/minizip
28
		eautoreconf
29
		eautoreconf
Lines 34-47 Link Here
34
	case ${CHOST} in
35
	case ${CHOST} in
35
	*-mingw*|mingw*)
36
	*-mingw*|mingw*)
36
		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die
37
		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die
37
		sed \
38
			-e 's|@prefix@|/usr|g' \
39
			-e 's|@exec_prefix@|${prefix}|g' \
40
			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
41
			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
42
			-e 's|@includedir@|${prefix}/include|g' \
43
			-e 's|@VERSION@|'${PV}'|g' \
44
			zlib.pc.in > zlib.pc || die
45
		;;
38
		;;
46
	*)	# not an autoconf script, so can't use econf
39
	*)	# not an autoconf script, so can't use econf
47
		echoit ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
40
		echoit ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
Lines 64-76 Link Here
64
	case ${CHOST} in
57
	case ${CHOST} in
65
	*-mingw*|mingw*)
58
	*-mingw*|mingw*)
66
		emake -f win32/Makefile.gcc install \
59
		emake -f win32/Makefile.gcc install \
67
			BINARY_PATH="${D}/usr/bin" \
60
			DESTDIR="${D}" \
68
			LIBRARY_PATH="${D}/usr/$(get_libdir)" \
61
			BINARY_PATH="/usr/bin" \
69
			INCLUDE_PATH="${D}/usr/include" \
62
			LIBRARY_PATH="/usr/$(get_libdir)" \
63
			INCLUDE_PATH="/usr/include" \
70
			SHARED_MODE=1 \
64
			SHARED_MODE=1 \
71
			|| die
65
			|| die
72
		insinto /usr/share/pkgconfig
73
		doins zlib.pc || die
74
		;;
66
		;;
75
67
76
	*)
68
	*)
Lines 89-93 Link Here
89
		dodoc *.txt
81
		dodoc *.txt
90
	fi
82
	fi
91
83
92
	use static-libs || rm -f "${D}"/usr/$(get_libdir)/*.{a,la}
84
	# Don't delete libz.dll.a because that's the import lib necessary
85
	# for dynamic linking (on mingw32).
86
	if ! use static-libs; then
87
		local lib
88
		for lib in "${D}"/usr/$(get_libdir)/*.{a,la}; do
89
			[[ ${lib} != *.dll.a ]] && { rm -f "${lib}" || die; }
90
		done
91
	fi
93
}
92
}

Return to bug 407497