From 9a7974babfcf1139115711d5ae80d94ebd6627b4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 26 Oct 2004 14:05:29 +0000 Subject: [PATCH] use $(tc-getCC) --- media-libs/gd/gd-1.8.4-r2.ebuild | 8 ++++---- media-libs/ming/ming-0.2a.ebuild | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/media-libs/gd/gd-1.8.4-r2.ebuild b/media-libs/gd/gd-1.8.4-r2.ebuild index 33327d8f412e..5462f575680d 100644 --- a/media-libs/gd/gd-1.8.4-r2.ebuild +++ b/media-libs/gd/gd-1.8.4-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-1.8.4-r2.ebuild,v 1.1 2004/06/30 15:51:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-1.8.4-r2.ebuild,v 1.2 2004/10/26 14:02:44 vapier Exp $ -inherit eutils gcc +inherit eutils toolchain-funcs DESCRIPTION="A graphics library for fast image creation" HOMEPAGE="http://www.boutell.com/gd/" @@ -30,7 +30,7 @@ src_unpack() { local incopts use alpha \ - && [ "$(gcc-getCC)" == "ccc" ] \ + && [ "$(tc-getCC)" == "ccc" ] \ && epatch ${FILESDIR}/${PV}-dec-alpha-compiler.diff use X \ @@ -58,7 +58,7 @@ src_unpack() { -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \ -e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \ -e "s:^\(INCLUDEDIRS\)=:\1=${incopts} :" \ - -e "s:\(COMPILER=\)gcc:\1${CC:-gcc}:" \ + -e "s:\(COMPILER=\)gcc:\1$(tc-getCC):" \ Makefile || die } diff --git a/media-libs/ming/ming-0.2a.ebuild b/media-libs/ming/ming-0.2a.ebuild index 27d281956042..e7e35ac18e03 100644 --- a/media-libs/ming/ming-0.2a.ebuild +++ b/media-libs/ming/ming-0.2a.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.20 2004/10/07 03:00:54 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.21 2004/10/26 14:05:29 vapier Exp $ -inherit eutils +inherit eutils toolchain-funcs DESCRIPTION="A OpenSource library from flash movie generation" HOMEPAGE="http://www.opaque.net/ming/" @@ -10,31 +10,31 @@ SRC_URI="http://www.opaque.net/ming/${P}.tgz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" IUSE="" DEPEND="virtual/libc" src_unpack() { - unpack ${A} ; cd ${S} + unpack ${A} + cd ${S} epatch ${FILESDIR}/${P}-fpic.patch epatch ${FILESDIR}/${PF}-gentoo.diff } src_compile() { - make CC="gcc -Wall" all static || die + make CC="$(tc-getCC) -Wall" all static || die cd util - make CC="gcc -Wall" bindump hexdump listswf listfdb listmp3 listjpeg makefdb swftophp \ - || die + make CC="$(tc-getCC) -Wall" bindump hexdump listswf listfdb listmp3 listjpeg makefdb swftophp || die } src_install() { - dolib.so libming.so - dolib.a libming.a + dolib.so libming.so || die "lib.so" + dolib.a libming.a || die "lib.a" insinto /usr/include - doins ming.h + doins ming.h || die "include" exeinto /usr/$(get_libdir)/ming - doexe util/{bindump,hexdump,listswf,listfdb,listmp3,listjpeg,makefdb,swftophp} + doexe util/{bindump,hexdump,listswf,listfdb,listmp3,listjpeg,makefdb,swftophp} || die "utils" dodoc CHANGES CREDITS README TODO newdoc util/README README.util newdoc util/TODO TODO.util -- 2.26.2