diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-26 22:54:49 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-26 22:54:49 +0000 |
| commit | 9629b9d864e486a210dd97294a61ed54fcd6d875 (patch) | |
| tree | 4ae5ef6d00a8581eeac4abb01a3d56470b339a6f /x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild | |
| parent | Stable on alpha. (diff) | |
| download | gentoo-2-9629b9d864e486a210dd97294a61ed54fcd6d875.tar.gz gentoo-2-9629b9d864e486a210dd97294a61ed54fcd6d875.tar.bz2 gentoo-2-9629b9d864e486a210dd97294a61ed54fcd6d875.zip | |
Multilib fixes and use proper toolchain compiler.
(Portage version: 2.0.51.19)
Diffstat (limited to 'x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild')
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild index 30d12488dd7e..318849317452 100644 --- a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.5 2005/01/16 10:56:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.6 2005/03/26 22:54:49 eradicator Exp $ -inherit flag-o-matic eutils gnuconfig +inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" HOMEPAGE="http://www.wxwidgets.org/" @@ -68,6 +68,7 @@ src_compile() { myconf="${myconf} `use_with opengl`" myconf="${myconf} --with-gtk" myconf="${myconf} `use_enable debug`" + myconf="${myconf} --libdir=/usr/$(get_libdir)" if ! use no_wxgtk1 ; then mkdir build_gtk @@ -78,9 +79,9 @@ src_compile() { --prefix=/usr \ --infodir=/usr/share/info \ --mandir=/usr/share/man || die "./configure failed" - emake || die "make gtk failed" + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed" cd contrib/src - emake || die "make gtk contrib failed" + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed" fi cd ${S} @@ -94,9 +95,9 @@ src_compile() { --prefix=/usr \ --infodir=/usr/share/info \ --mandir=/usr/share/man || die "./configure failed" - emake || die "make gtk2 failed" + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed" cd contrib/src - emake || die "make gtk2 contrib failed" + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed" cd ${S} @@ -111,10 +112,10 @@ src_compile() { --infodir=/usr/share/info \ --mandir=/usr/share/man || die "./configure failed" - emake || die "make unicode failed" + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed" cd contrib/src - emake || die "make unicode contrib failed" + emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed" fi fi } @@ -122,23 +123,23 @@ src_compile() { src_install() { if [ -e ${S}/build_gtk ] ; then cd ${S}/build_gtk - einstall || die "install gtk failed" + einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed" cd contrib/src - einstall || die "install gtk contrib failed" + einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed" fi if [ -e ${S}/build_gtk2 ] ; then cd ${S}/build_gtk2 - einstall || die "install gtk2 failed" + einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed" cd contrib/src - einstall || die "install gtk2 contrib failed" + einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed" fi if [ -e ${S}/build_unicode ] ; then cd ${S}/build_unicode - einstall || die "install unicode failed" + einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed" cd contrib/src - einstall || die "install unicode contrib failed" + einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed" fi # twp 20040830 wxGTK-2.4.2 forgets to install htmlproc.h; copy it manually |