Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 481098
Collapse All | Expand All

(-)s/wxwidgets.eclass (-4 / +4 lines)
Lines 71-83 Link Here
71
			# newer versions don't have a seperate debug profile
71
			# newer versions don't have a seperate debug profile
72
			for wxdebug in xxx release- debug-; do
72
			for wxdebug in xxx release- debug-; do
73
				wxconf="${wxtoolkit}-${wxchar}-${wxdebug/xxx/}${WX_GTK_VER}"
73
				wxconf="${wxtoolkit}-${wxchar}-${wxdebug/xxx/}${WX_GTK_VER}"
74
				if [[ -f /usr/$(get_libdir)/wx/config/${wxconf} ]]; then
74
				if [[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]]; then
75
					# if this is a wxBase install, die in pkg_setup
75
					# if this is a wxBase install, die in pkg_setup
76
					[[ ${wxtoolkit} == "base" ]] && WXBASE_DIE=1
76
					[[ ${wxtoolkit} == "base" ]] && WXBASE_DIE=1
77
				else
77
				else
78
					continue
78
					continue
79
				fi
79
				fi
80
				WX_CONFIG="/usr/$(get_libdir)/wx/config/${wxconf}"
80
				WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}"
81
				WX_ECLASS_CONFIG="${WX_CONFIG}"
81
				WX_ECLASS_CONFIG="${WX_CONFIG}"
82
				break
82
				break
83
			done
83
			done
Lines 229-235 Link Here
229
	debug-print "wxconf is ${wxconf}"
231
	debug-print "wxconf is ${wxconf}"
230
232
231
	# if this doesn't work, something is seriously screwed
233
	# if this doesn't work, something is seriously screwed
232
	if [[ ! -f /usr/$(get_libdir)/wx/config/${wxconf} ]]; then
234
	if [[ ! -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]]; then
233
		echo
235
		echo
234
		eerror "Failed to find configuration ${wxconf}"
236
		eerror "Failed to find configuration ${wxconf}"
235
		echo
237
		echo
Lines 238-244 Link Here
238
240
239
	debug-print "Found config ${wxconf} - setting WX_CONFIG"
241
	debug-print "Found config ${wxconf} - setting WX_CONFIG"
240
242
241
	export WX_CONFIG="/usr/$(get_libdir)/wx/config/${wxconf}"
243
	export WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}"
242
244
243
	debug-print "WX_CONFIG is ${WX_CONFIG}"
245
	debug-print "WX_CONFIG is ${WX_CONFIG}"
244
246

Return to bug 481098