[patch] Multilib patch for wx-config and wxrc wrappers

commit-41073fe.patch (text/plain), 1.80 KB, created by nE0sIghT on 2015-03-29 22:12:14 UTC

commit 41073fe718c2249a74200d51931d3a58eef3171a
Author: nE0sIghT <[e-mail]>
Date:   Mon Mar 30 01:06:43 2015 +0300

    eselect-wxwidgets: multilib conversion part 2

diff --git a/app-admin/eselect-wxwidgets/files/wx-config-1.4 b/app-admin/eselect-wxwidgets/files/wx-config-1.4
index 30080ac..66cac90 100755
--- a/app-admin/eselect-wxwidgets/files/wx-config-1.4
+++ b/app-admin/eselect-wxwidgets/files/wx-config-1.4
@@ -7,6 +7,13 @@
 
 EPREFIX=''
 LIBDIR="lib"
+WXCONFIG_VAR="WXCONFIG"
+
+if [[ -n "${ABI}" ]]; then
+	var="LIBDIR_${ABI}"
+	[[ -n "${!var}" ]] && LIBDIR="${!var}"
+	[[ "${LIBDIR}" == "lib32" ]] && WXCONFIG_VAR="WXCONFIG_32"
+fi
 
 _wxerror() {
 	cat >&2 <<- EOF
@@ -29,6 +36,7 @@ else
 		_wxerror "Cannot find the wxWidgets profile configuration ( ${EPREFIX}/var/lib/wxwidgets/current )"
 	fi
 
+	WXCONFIG=${!WXCONFIG_VAR}
 	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
 
 	if [ -x "${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" ]; then
diff --git a/app-admin/eselect-wxwidgets/files/wxrc-1.4 b/app-admin/eselect-wxwidgets/files/wxrc-1.4
index b9434de..c6ed895 100755
--- a/app-admin/eselect-wxwidgets/files/wxrc-1.4
+++ b/app-admin/eselect-wxwidgets/files/wxrc-1.4
@@ -7,6 +7,13 @@
 
 EPREFIX=''
 LIBDIR="lib"
+WXCONFIG_VAR="WXCONFIG"
+
+if [[ -n "${ABI}" ]]; then
+        var="LIBDIR_${ABI}"
+        [[ -n "${!var}" ]] && LIBDIR="${!var}"
+        [[ "${LIBDIR}" == "lib32" ]] && WXCONFIG_VAR="WXCONFIG_32"
+fi
 
 _wxerror() {
 	cat >&2 <<- EOF
@@ -29,6 +36,7 @@ else
 		_wxerror "Cannot find the wxWidgets profile configuration ( ${EPREFIX}/var/lib/wxwidgets/current )"
 	fi
 
+	WXCONFIG=${!WXCONFIG_VAR}
 	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
 
 	if [ -x "${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" ]; then