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

Collapse All | Expand All

(-)a/app-admin/eselect-wxwidgets/files/wx-config-1.4 (+8 lines)
Lines 7-12 Link Here
7
7
8
EPREFIX=''
8
EPREFIX=''
9
LIBDIR="lib"
9
LIBDIR="lib"
10
WXCONFIG_VAR="WXCONFIG"
11
12
if [[ -n "${ABI}" ]]; then
13
	var="LIBDIR_${ABI}"
14
	[[ -n "${!var}" ]] && LIBDIR="${!var}"
15
	[[ "${LIBDIR}" == "lib32" ]] && WXCONFIG_VAR="WXCONFIG_32"
16
fi
10
17
11
_wxerror() {
18
_wxerror() {
12
	cat >&2 <<- EOF
19
	cat >&2 <<- EOF
Lines 29-34 else Link Here
29
		_wxerror "Cannot find the wxWidgets profile configuration ( ${EPREFIX}/var/lib/wxwidgets/current )"
36
		_wxerror "Cannot find the wxWidgets profile configuration ( ${EPREFIX}/var/lib/wxwidgets/current )"
30
	fi
37
	fi
31
38
39
	WXCONFIG=${!WXCONFIG_VAR}
32
	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
40
	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
33
41
34
	if [ -x "${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" ]; then
42
	if [ -x "${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" ]; then
(-)a/app-admin/eselect-wxwidgets/files/wxrc-1.4 (+8 lines)
Lines 7-12 Link Here
7
7
8
EPREFIX=''
8
EPREFIX=''
9
LIBDIR="lib"
9
LIBDIR="lib"
10
WXCONFIG_VAR="WXCONFIG"
11
12
if [[ -n "${ABI}" ]]; then
13
        var="LIBDIR_${ABI}"
14
        [[ -n "${!var}" ]] && LIBDIR="${!var}"
15
        [[ "${LIBDIR}" == "lib32" ]] && WXCONFIG_VAR="WXCONFIG_32"
16
fi
10
17
11
_wxerror() {
18
_wxerror() {
12
	cat >&2 <<- EOF
19
	cat >&2 <<- EOF
Lines 29-34 else Link Here
29
		_wxerror "Cannot find the wxWidgets profile configuration ( ${EPREFIX}/var/lib/wxwidgets/current )"
36
		_wxerror "Cannot find the wxWidgets profile configuration ( ${EPREFIX}/var/lib/wxwidgets/current )"
30
	fi
37
	fi
31
38
39
	WXCONFIG=${!WXCONFIG_VAR}
32
	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
40
	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
33
41
34
	if [ -x "${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" ]; then
42
	if [ -x "${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" ]; then

Return to bug 510708