diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-03-01 12:18:25 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-03-01 12:18:25 +0000 |
| commit | 0764ba3d94493d759b57d85a21882860da24e18e (patch) | |
| tree | 1ad8aefc559d840993a6a3c99d306b04de642389 /sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild | |
| parent | Stable for ia64, wrt bug #459326 (diff) | |
| download | gentoo-2-0764ba3d94493d759b57d85a21882860da24e18e.tar.gz gentoo-2-0764ba3d94493d759b57d85a21882860da24e18e.tar.bz2 gentoo-2-0764ba3d94493d759b57d85a21882860da24e18e.zip | |
sci-mathematics/gsl-shell: Use pkg-config to detect gsl, libagg, freetype (#459474) and fox
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild')
| -rw-r--r-- | sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild index 368831376059..95c19af3c3c2 100644 --- a/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild +++ b/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild,v 1.4 2013/02/27 15:07:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild,v 1.5 2013/03/01 12:18:24 jlec Exp $ EAPI=4 @@ -30,7 +30,12 @@ DEPEND="${DEPEND} S="${WORKDIR}"/${PN} src_prepare() { - epatch "${FILESDIR}"/${PN}-font.patch "${FILESDIR}"/${PN}-strip.patch "${FILESDIR}"/${PN}-usr.patch + tc-export PKG_CONFIG + epatch \ + "${FILESDIR}"/${PN}-font.patch \ + "${FILESDIR}"/${PN}-strip.patch \ + "${FILESDIR}"/${PN}-usr.patch \ + "${FILESDIR}"/${P}-pkg-config.patch use fox || epatch "${FILESDIR}"/${PN}-nogui.patch } @@ -40,10 +45,10 @@ src_compile() { if use fox; then local FOX_INCLUDES=`WANT_FOX=1.6 fox-config --cflags` local FOX_LIBS=`WANT_FOX=1.6 fox-config --libs` - emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}" \ + emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}" \ FOX_INCLUDES="${FOX_INCLUDES}" FOX_LIBS="${FOX_LIBS}" else - emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="-lgsl ${BLAS}" + emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}" fi if use doc; then |