aboutsummaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-04-24 01:48:20 -0700
committerGregory M. Tuner <gmt@be-evil.net>2014-04-24 01:48:20 -0700
commit9fe0379091c4de07cca99b521b07d0b05994d8ce (patch)
tree0c9cde96b8903bd5872919fd8ca1ea20be291e0f /eclass
parentapp-emulation/emul-linux-x86-gtklibs: install the *32 executables (diff)
downloadgmt-9fe0379091c4de07cca99b521b07d0b05994d8ce.tar.gz
gmt-9fe0379091c4de07cca99b521b07d0b05994d8ce.tar.bz2
gmt-9fe0379091c4de07cca99b521b07d0b05994d8ce.zip
eclass/gnome2-multilib.eclass: MULTILIB_CHOST_TOOLS migration path
This adds support for MULTILIB_CHOST_TOOLS-based wrappers for gtk-query-immodules-{2,3}.0 along-side the old MULTILIB_WRAPPED_EXECUTABLES-based naming conventions to gnome2-multilib_query_immodules{,_gtk3}. This should provide a clean migration path for any programs using the old names. This is part of a broader plan to migrate all MULTILIB_WRAPPED_EXECUTABLES usage to MULTILIB_CHOST_TOOLS, since, it is clearly retarded (UK residents: please read 'mentally handicapped' or whatever you find tolerably inoffensive) to have both of these features around serving exactly the same purpose. Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/gnome2-multilib.eclass7
1 files changed, 7 insertions, 0 deletions
diff --git a/eclass/gnome2-multilib.eclass b/eclass/gnome2-multilib.eclass
index 22c3f25..a2ea2b8 100644
--- a/eclass/gnome2-multilib.eclass
+++ b/eclass/gnome2-multilib.eclass
@@ -437,7 +437,10 @@ gnome2-multilib_query_immodules_gtk2() {
if [[ ${MULTILIB_BUILD_ABI} ]] ; then
local query_exec="${EPREFIX}"/usr/bin/gtk-query-immodules-2.0
if [[ -x "${EPREFIX}"/usr/bin/gtk-query-immodules-2.0-${MULTILIB_BUILD_ABI} ]]; then
+ # legacy MULTILIB_WRAPPED_EXECUTABLES-based location
query_exec="${EPREFIX}"/usr/bin/gtk-query-immodules-2.0-${MULTILIB_BUILD_ABI}
+ elif [[ -x "${EPREFIX}"/usr/bin/${CHOST}-gtk-query-immodules-2.0 ]]; then
+ query_exec="${EPREFIX}"/usr/bin/${CHOST}-gtk-query-immodules-2.0
fi
if [[ ! -x ${query_exec} ]]; then
debug-print "${FUNCNAME}: Could not find any suitable gtk-query-immodules-2.0"
@@ -482,7 +485,11 @@ gnome2-multilib_query_immodules_gtk3() {
if [[ ${MULTILIB_BUILD_ABI} ]]; then
if [[ -f "${EPREFIX}"/usr/bin/gtk-query-immodules-3.0-${MULTILIB_BUILD_ABI} ]]; then
+ # legacy MULTILIB_WRAPPED_EXECUTABLES-based location (delme, eventually)
"${EPREFIX}"/usr/bin/gtk-query-immodules-3.0-${MULTILIB_BUILD_ABI} --update-cache
+ elif [[ -f "${EPREFIX}"/usr/bin/${CHOST}-gtk-query-immodules-3.0 ]]; then
+ # MULTILIB_CHOST_TOOLS-based location
+ "${EPREFIX}"/usr/bin/${CHOST}-gtk-query-immodules-3.0 --update-cache
else
"${EPREFIX}"/usr/bin/gtk-query-immodules-3.0 --update-cache
fi