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

Collapse All | Expand All

(-)zlib-1.2.5.ebuild.org (-9 / +25 lines)
Lines 19-25 RDEPEND="!<dev-libs/libxml2-2.7.7" #3096 Link Here
19
src_unpack() {
19
src_unpack() {
20
	unpack ${A}
20
	unpack ${A}
21
	cd "${S}"
21
	cd "${S}"
22
	epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212
23
	# trust exit status of the compiler rather than stderr #55434
22
	# trust exit status of the compiler rather than stderr #55434
24
	# -if test "`(...) 2>&1`" = ""; then
23
	# -if test "`(...) 2>&1`" = ""; then
25
	# +if (...) 2>/dev/null; then
24
	# +if (...) 2>/dev/null; then
Lines 29-37 src_unpack() { Link Here
29
src_compile() {
28
src_compile() {
30
	case ${CHOST} in
29
	case ${CHOST} in
31
	*-mingw*|mingw*)
30
	*-mingw*|mingw*)
32
		emake -f win32/Makefile.gcc prefix=/usr STRIP= PREFIX=${CHOST}- || die
31
		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die
32
		sed \
33
			-e 's|@prefix@|/usr|g' \
34
			-e 's|@exec_prefix@|${prefix}|g' \
35
			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
36
			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
37
			-e 's|@includedir@|${prefix}/include|g' \
38
			-e 's|@VERSION@|'${PV}'|g' \
39
			zlib.pc.in > zlib.pc || die
33
		;;
40
		;;
34
	*)	# not an autoconf script, so cant use econf
41
	*)	# not an autoconf script, so can't use econf
35
		./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
42
		./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
36
		emake || die
43
		emake || die
37
		;;
44
		;;
Lines 39-52 src_compile() { Link Here
39
}
46
}
40
47
41
src_install() {
48
src_install() {
42
	emake install DESTDIR="${D}" LDCONFIG=: || die
43
	dodoc FAQ README ChangeLog doc/*.txt
44
45
	case ${CHOST} in
49
	case ${CHOST} in
46
	*-mingw*|mingw*)
50
	*-mingw*|mingw*)
47
		dobin zlib1.dll || die
51
		emake -f win32/Makefile.gcc install \
48
		dolib libz.dll.a || die
52
			BINARY_PATH="${D}/usr/bin" \
53
			LIBRARY_PATH="${D}/usr/$(get_libdir)" \
54
			INCLUDE_PATH="${D}/usr/include" \
55
			SHARED_MODE=1 \
56
			|| die
57
		insinto /usr/$(get_libdir)/pkgconfig
58
		doins zlib.pc || die
59
		;;
60
61
	*)
62
		emake install DESTDIR="${D}" LDCONFIG=: || die
63
		gen_usr_ldscript -a z
49
		;;
64
		;;
50
	*) gen_usr_ldscript -a z ;;
51
	esac
65
	esac
66
67
	dodoc FAQ README ChangeLog doc/*.txt
52
}
68
}

Return to bug 310307