diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
commit | 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch) | |
tree | 4d26462d027b14926335894749d2e01d982234d0 /eclass/wxwidgets.eclass | |
parent | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff) |
gentoo resync : 27.03.2021
Diffstat (limited to 'eclass/wxwidgets.eclass')
-rw-r--r-- | eclass/wxwidgets.eclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index 9b37074d3b62..e1f77f0b7c2b 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: wxwidgets.eclass @@ -22,6 +22,7 @@ # wxGTK was built with. if [[ -z ${_WXWIDGETS_ECLASS} ]]; then +_WXWIDGETS_ECLASS=1 inherit flag-o-matic @@ -80,7 +81,7 @@ esac # See: http://docs.wxwidgets.org/trunk/overview_debugging.html setup-wxwidgets() { - local wxtoolkit wxdebug wxconf + local w wxtoolkit wxdebug wxconf [[ -z ${WX_GTK_VER} ]] \ && die "WX_GTK_VER must be set before calling $FUNCNAME." @@ -116,17 +117,17 @@ setup-wxwidgets() { fi wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}" + for w in "${CHOST:-${CBUILD}}-${wxconf}" "${wxconf}"; do + [[ -f ${ESYSROOT:-${EPREFIX}}/usr/$(get_libdir)/wx/config/${w} ]] && wxconf=${w} && break + done || die "Failed to find configuration ${wxconf}" - [[ ! -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] \ - && die "Failed to find configuration ${wxconf}" - - export WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}" + export WX_CONFIG="${ESYSROOT:-${EPREFIX}}/usr/$(get_libdir)/wx/config/${wxconf}" export WX_ECLASS_CONFIG="${WX_CONFIG}" - echo + einfo einfo "Requested wxWidgets: ${WX_GTK_VER}" einfo "Using wxWidgets: ${wxconf}" - echo + einfo } case ${EAPI:-0} in @@ -138,5 +139,4 @@ case ${EAPI:-0} in ;; esac -_WXWIDGETS_ECLASS=1 fi |