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

Collapse All | Expand All

(-)a/sys-libs/zlib/zlib-1.2.11.ebuild (-13 / +15 lines)
Lines 27-34 Link Here
27
27
28
src_prepare() {
28
src_prepare() {
29
	if use minizip ; then
29
	if use minizip ; then
30
		case ${CHOST} in
31
		*-cygwin*)
32
			epatch "${FILESDIR}"/${P}-minizip-cygwin.patch
33
			;;
34
		esac
30
		cd contrib/minizip || die
35
		cd contrib/minizip || die
31
		eautoreconf
36
		eautoreconf
37
		cd "${S}"
32
	fi
38
	fi
33
39
34
#	epatch "${FILESDIR}"/${PN}-1.2.7-aix-soname.patch #213277
40
#	epatch "${FILESDIR}"/${PN}-1.2.7-aix-soname.patch #213277
Lines 42-47 Link Here
42
		# zlib1.dll is the mingw name, need cygz.dll
48
		# zlib1.dll is the mingw name, need cygz.dll
43
		# cygz.dll is loaded by toolchain, put into subdir
49
		# cygz.dll is loaded by toolchain, put into subdir
44
		sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
50
		sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
51
		# The shared libraries are installed into the binary path,
52
		# so the .pc file must mirror that:
53
		epatch "${FILESDIR}"/${P}-pkgconfig-cygwin.patch
45
		;;
54
		;;
46
	esac
55
	esac
47
56
Lines 83-96 Link Here
83
	case ${CHOST} in
92
	case ${CHOST} in
84
	*-mingw*|mingw*|*-cygwin*)
93
	*-mingw*|mingw*|*-cygwin*)
85
		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
94
		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
86
		sed \
87
			-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
88
			-e 's|@exec_prefix@|${prefix}|g' \
89
			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
90
			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
91
			-e 's|@includedir@|${prefix}/include|g' \
92
			-e 's|@VERSION@|'${PV}'|g' \
93
			zlib.pc.in > zlib.pc || die
94
		;;
95
		;;
95
	*)
96
	*)
96
		emake
97
		emake
Lines 109-120 Link Here
109
	case ${CHOST} in
110
	case ${CHOST} in
110
	*-mingw*|mingw*|*-cygwin*)
111
	*-mingw*|mingw*|*-cygwin*)
111
		emake -f win32/Makefile.gcc install \
112
		emake -f win32/Makefile.gcc install \
112
			BINARY_PATH="${ED}/usr/bin" \
113
			prefix="${EPREFIX}/usr" \
113
			LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
114
			exec_prefix="\${prefix}" \
114
			INCLUDE_PATH="${ED}/usr/include" \
115
			BINARY_PATH="${ED}usr/bin" \
116
			LIBRARY_PATH="${ED}usr/$(get_libdir)" \
117
			INCLUDE_PATH="${ED}usr/include" \
115
			SHARED_MODE=1
118
			SHARED_MODE=1
116
		insinto /usr/share/pkgconfig
119
			sed -i -e "s,${ED}usr,\${prefix},g" "${ED}"usr/$(get_libdir)/pkgconfig/*.pc || die
117
		doins zlib.pc
118
		;;
120
		;;
119
121
120
	*)
122
	*)

Return to bug 643916