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

Collapse All | Expand All

(-)/opt/gentoo/usr/portage/dev-libs/glib/glib-2.22.4.ebuild (-5 / +16 lines)
Lines 20-29 Link Here
20
	fam? ( virtual/fam )"
20
	fam? ( virtual/fam )"
21
DEPEND="${RDEPEND}
21
DEPEND="${RDEPEND}
22
	>=dev-util/pkgconfig-0.16
22
	>=dev-util/pkgconfig-0.16
23
	x86-winnt? ( >=dev-util/gtk-doc-am-1.11 )
23
	x86-winnt? ( >=dev-util/gtk-doc-am-1.13 )
24
	x86-interix? ( 
24
	x86-interix? ( 
25
		sys-libs/itx-bind
25
		sys-libs/itx-bind
26
		>=dev-util/gtk-doc-am-1.11 
26
		>=dev-util/gtk-doc-am-1.13 
27
	)
27
	)
28
	doc? (
28
	doc? (
29
		>=dev-libs/libxslt-1.0
29
		>=dev-libs/libxslt-1.0
Lines 62-68 Link Here
62
	epatch "${FILESDIR}"/${PN}-2.16.3-macos-inline.patch
62
	epatch "${FILESDIR}"/${PN}-2.16.3-macos-inline.patch
63
	epatch "${FILESDIR}"/${PN}-2.18.4-compile-warning-sol64.patch
63
	epatch "${FILESDIR}"/${PN}-2.18.4-compile-warning-sol64.patch
64
	epatch "${FILESDIR}"/${PN}-2.20.3-mint.patch
64
	epatch "${FILESDIR}"/${PN}-2.20.3-mint.patch
65
	# configure script lets itself being fooled by bind 8 stuff
65
66
	# configure script lets itself be fooled by bind 8 stuff
66
	[[ ${CHOST} == *-darwin[678] ]] && append-libs -lresolv
67
	[[ ${CHOST} == *-darwin[678] ]] && append-libs -lresolv
67
68
68
	# make default sane for us
69
	# make default sane for us
Lines 85-101 Link Here
85
		# there are hunks disabling some GTK_DOC macros - i guess that
86
		# there are hunks disabling some GTK_DOC macros - i guess that
86
		# the gtk-doc-am package in the tree is too old to bootstrap
87
		# the gtk-doc-am package in the tree is too old to bootstrap
87
		# glib correctly ... :/
88
		# glib correctly ... :/
88
		epatch "${FILESDIR}"/${P}-interix.patch
89
		epatch "${FILESDIR}"/${PN}-2.22.3-interix.patch
90
		epatch "${FILESDIR}"/${P}-interix-pthread.patch
89
91
90
		# interix 3 and 5 have no ipv6 support, so take it out (phew...)
92
		# interix 3 and 5 have no ipv6 support, so take it out (phew...)
91
		if [[ ${CHOST} == *-interix[35]* ]]; then
93
		if [[ ${CHOST} == *-interix[35]* ]]; then
92
			epatch "${FILESDIR}"/${P}-interix-network.patch
94
			epatch "${FILESDIR}"/${PN}-2.22.3-interix-network.patch
95
		fi
96
97
		# on interix 6, for some reason, ld segfaults if _REENTRANT is
98
		# defined during the gmodule compile.  This kludge turns it off
99
		if [[ ${CHOST} == *-interix6* ]]; then
100
			epatch "${FILESDIR}"/${P}-interix6-gmodule-no-reentrant.patch
93
		fi
101
		fi
94
102
95
		# activate the itx-bind package...
103
		# activate the itx-bind package...
104
96
		append-flags "-I${EPREFIX}/usr/include/bind"
105
		append-flags "-I${EPREFIX}/usr/include/bind"
97
		append-ldflags "-L${EPREFIX}/usr/lib/bind"
106
		append-ldflags "-L${EPREFIX}/usr/lib/bind"
98
107
108
		epatch "${FILESDIR}"/${PN}-2.22.3-interix-headers.patch
109
99
		AT_M4DIR="m4macros" eautoreconf
110
		AT_M4DIR="m4macros" eautoreconf
100
	fi
111
	fi
101
112

Return to bug 298286