diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2014-04-21 21:55:31 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2014-04-21 21:55:31 +0000 |
| commit | cb8665f5ccd9a5db693c6e37d9b0c9bf857ee178 (patch) | |
| tree | c07f8642f5d687969fd7c38e5a182847265455ff /eclass | |
| parent | Stable for amd64 wrt bug #504790 (diff) | |
| download | gentoo-2-cb8665f5ccd9a5db693c6e37d9b0c9bf857ee178.tar.gz gentoo-2-cb8665f5ccd9a5db693c6e37d9b0c9bf857ee178.tar.bz2 gentoo-2-cb8665f5ccd9a5db693c6e37d9b0c9bf857ee178.zip | |
added prefix support (bug #401661)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/wxwidgets.eclass | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 3491cfbf6a4f..00136550ab0e 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1219 2014/04/21 08:23:57 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1220 2014/04/21 21:55:31 ottxor Exp $ + + 21 Apr 2014; Christoph Junghans <ottxor@gentoo.org> wxwidgets.eclass: + added prefix support (bug #401661) 21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Add a QA warning to multilib_is_native_abi. diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index c5e6be4fea3d..aa8f920931fd 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.38 2013/12/30 08:25:35 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.39 2014/04/21 21:55:31 ottxor Exp $ # @ECLASS: wxwidgets.eclass # @MAINTAINER: @@ -59,7 +59,7 @@ inherit eutils multilib # inheriting. if [[ -z ${WX_CONFIG} ]]; then if [[ -n ${WX_GTK_VER} ]]; then - for wxtoolkit in gtk2 base; do + for wxtoolkit in mac gtk2 base; do # newer versions don't have a seperate debug profile for wxdebug in xxx release- debug-; do wxconf="${wxtoolkit}-unicode-${wxdebug/xxx/}${WX_GTK_VER}" @@ -109,7 +109,9 @@ need-wxwidgets() { esac # wxbase is provided by both gtk2 and base installations - if has_version "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then + if has_version "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then + wxtoolkit="mac" + elif has_version "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then wxtoolkit="gtk2" else wxtoolkit="base" |