/[gentoo-x86]/eclass/wxwidgets.eclass
Gentoo

Diff of /eclass/wxwidgets.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.32 Revision 1.33
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2013 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.32 2011/12/27 17:55:13 fauli Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.33 2013/08/16 07:51:36 heroxbd Exp $
4 4
5# @ECLASS: wxwidgets.eclass 5# @ECLASS: wxwidgets.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# wxwidgets@gentoo.org 7# wxwidgets@gentoo.org
8# @BLURB: Manages build configuration for wxGTK-using packages. 8# @BLURB: Manages build configuration for wxGTK-using packages.
69 fi 69 fi
70 for wxtoolkit in gtk2 base; do 70 for wxtoolkit in gtk2 base; do
71 # newer versions don't have a seperate debug profile 71 # newer versions don't have a seperate debug profile
72 for wxdebug in xxx release- debug-; do 72 for wxdebug in xxx release- debug-; do
73 wxconf="${wxtoolkit}-${wxchar}-${wxdebug/xxx/}${WX_GTK_VER}" 73 wxconf="${wxtoolkit}-${wxchar}-${wxdebug/xxx/}${WX_GTK_VER}"
74 if [[ -f /usr/$(get_libdir)/wx/config/${wxconf} ]]; then 74 if [[ -f "${EPREFIX}"/usr/$(get_libdir)/wx/config/${wxconf} ]]; then
75 # if this is a wxBase install, die in pkg_setup 75 # if this is a wxBase install, die in pkg_setup
76 [[ ${wxtoolkit} == "base" ]] && WXBASE_DIE=1 76 [[ ${wxtoolkit} == "base" ]] && WXBASE_DIE=1
77 else 77 else
78 continue 78 continue
79 fi 79 fi
80 WX_CONFIG="/usr/$(get_libdir)/wx/config/${wxconf}" 80 WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}"
81 WX_ECLASS_CONFIG="${WX_CONFIG}" 81 WX_ECLASS_CONFIG="${WX_CONFIG}"
82 break 82 break
83 done 83 done
84 [[ -n ${WX_CONFIG} ]] && break 84 [[ -n ${WX_CONFIG} ]] && break
85 done 85 done
227 wxconf="${wxtoolkit}-${wxchar}-${wxdebug}${WX_GTK_VER}" 227 wxconf="${wxtoolkit}-${wxchar}-${wxdebug}${WX_GTK_VER}"
228 228
229 debug-print "wxconf is ${wxconf}" 229 debug-print "wxconf is ${wxconf}"
230 230
231 # if this doesn't work, something is seriously screwed 231 # if this doesn't work, something is seriously screwed
232 if [[ ! -f /usr/$(get_libdir)/wx/config/${wxconf} ]]; then 232 if [[ ! -f "${EPREFIX}"/usr/$(get_libdir)/wx/config/${wxconf} ]]; then
233 echo 233 echo
234 eerror "Failed to find configuration ${wxconf}" 234 eerror "Failed to find configuration ${wxconf}"
235 echo 235 echo
236 die "Missing wx-config" 236 die "Missing wx-config"
237 fi 237 fi
238 238
239 debug-print "Found config ${wxconf} - setting WX_CONFIG" 239 debug-print "Found config ${wxconf} - setting WX_CONFIG"
240 240
241 export WX_CONFIG="/usr/$(get_libdir)/wx/config/${wxconf}" 241 export WX_CONFIG=""${EPREFIX}"/usr/$(get_libdir)/wx/config/${wxconf}"
242 242
243 debug-print "WX_CONFIG is ${WX_CONFIG}" 243 debug-print "WX_CONFIG is ${WX_CONFIG}"
244 244
245 export WX_ECLASS_CONFIG="${WX_CONFIG}" 245 export WX_ECLASS_CONFIG="${WX_CONFIG}"
246 246

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.33

  ViewVC Help
Powered by ViewVC 1.1.20