Attachment #228553 for bug #310307

View | Details | Raw Unified | Return to bug 310307 | Differences between
Collapse All | Expand All




src_unpack() {
	unpack ${A}
	cd "${S}"
	epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212
	# trust exit status of the compiler rather than stderr #55434
	# -if test "`(...) 2>&1`" = ""; then
	# +if (...) 2>/dev/null; then

src_compile() {
	case ${CHOST} in
	*-mingw*|mingw*)
		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die
		;;
	*)	# not an autoconf script, so can't use econf
		./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
		emake || die
		;;

}

src_install() {
	emake install DESTDIR="${D}" LDCONFIG=: || die
	dodoc FAQ README ChangeLog doc/*.txt

	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" \
				SHARED_MODE=1 \
				|| die
			;;
		*)
			emake install DESTDIR="${D}" LDCONFIG=: || die
			gen_usr_ldscript -a z
			;;
	esac

	dodoc FAQ README ChangeLog doc/*.txt
}

Return to bug 310307

Lines 19-25 RDEPEND="!<dev-libs/libxml2-2.7.7" #3096 Link Here

(-)zlib-1.2.5.ebuild.org (-11 / +16 lines)
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
33	;;	32	;;
34	*) # not an autoconf script, so cant use econf	33	*) # not an autoconf script, so can't use econf
35	./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) \|\| die	34	./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) \|\| die
36	emake \|\| die	35	emake \|\| die
37	;;	36	;;
Lines 39-52 src_compile() { Link Here
39	}	38	}
40		39
41	src_install() {	40	src_install() {
42	emake install DESTDIR="${D}" LDCONFIG=: \|\| die
43	dodoc FAQ README ChangeLog doc/*.txt
44
45	case ${CHOST} in	41	case ${CHOST} in
46	-mingw\|mingw*)	42	-mingw\|mingw*)
47	dobin zlib1.dll \|\| die	43	emake -f win32/Makefile.gcc install \
48	dolib libz.dll.a \|\| die	44	BINARY_PATH="${D}/usr/bin" \
49	;;	45	LIBRARY_PATH="${D}/usr/$(get_libdir)" \
50	*) gen_usr_ldscript -a z ;;	46	INCLUDE_PATH="${D}/usr/include" \
		47	SHARED_MODE=1 \
		48	\|\| die
		49	;;
		50	*)
		51	emake install DESTDIR="${D}" LDCONFIG=: \|\| die
		52	gen_usr_ldscript -a z
		53	;;
51	esac	54	esac
		55
		56	dodoc FAQ README ChangeLog doc/*.txt
52	}	57	}