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

Collapse All | Expand All

(-)a/x11-base/xorg-server/xorg-server-9999.ebuild (-17 / +3 lines)
Lines 161-184 pkg_setup() { Link Here
161
			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
161
			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
162
		INFO="yes"
162
		INFO="yes"
163
	fi
163
	fi
164
}
165
166
src_configure() {
167
	# this is required only for configure and build time
168
	# we need to ensure having enough glxtokens
169
	# the subshell is needed so the addwrite is not shared in rest of that phase
170
	OLD_IMPLEM="$(eselect opengl show)"
171
	[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OPENGL_DIR}; )
172
	xorg-2_src_configure
173
}
174
164
175
src_compile() {
165
	# Export Gentoo-specific OpenGL include location to avoid switching opengl
176
	emake # no die here intentional
166
	# profiles.
177
	if [[ $? != 0 ]]; then
167
	export C_INCLUDE_PATH=/usr/$(get_libdir)/opengl/xorg-x11/include
178
		[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
179
		die "Compilation failed"
180
	fi
181
	[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
182
}
168
}
183
169
184
src_install() {
170
src_install() {

Return to bug 315347