diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-05-07 10:01:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-05-07 10:01:28 +0000 |
| commit | 980545f075333f6fc77b5f053ebbad573723930d (patch) | |
| tree | e5d430803410ec0c2e03475053a5b13069c2a4e0 /media-libs/libjpeg-turbo | |
| parent | Drop redudant configure option disable dependency tracking with EAPI=4 (diff) | |
| download | gentoo-2-980545f075333f6fc77b5f053ebbad573723930d.tar.gz gentoo-2-980545f075333f6fc77b5f053ebbad573723930d.tar.bz2 gentoo-2-980545f075333f6fc77b5f053ebbad573723930d.zip | |
Limit dev-lang/nasm DEPEND to amd64/x86/amd64-linux/and x86-linux wrt #364985. Convert to EAPI=4 while at it.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libjpeg-turbo')
| -rw-r--r-- | media-libs/libjpeg-turbo/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild | 22 |
2 files changed, 19 insertions, 10 deletions
diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog index 692e3d3fc860..12a5e2654bc9 100644 --- a/media-libs/libjpeg-turbo/ChangeLog +++ b/media-libs/libjpeg-turbo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libjpeg-turbo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.13 2011/03/28 12:31:28 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.14 2011/05/07 10:01:28 ssuominen Exp $ + + 07 May 2011; Samuli Suominen <ssuominen@gentoo.org> + libjpeg-turbo-1.1.0.ebuild: + Limit dev-lang/nasm DEPEND to amd64/x86/amd64-linux/and x86-linux wrt + #364985. 28 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> libjpeg-turbo-1.1.0.ebuild: diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild index 2e8e1b910359..3d83aeb54ae0 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild,v 1.6 2011/03/28 12:31:28 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild,v 1.7 2011/05/07 10:01:28 ssuominen Exp $ -EAPI=3 +EAPI=4 inherit libtool toolchain-funcs DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" @@ -15,9 +15,15 @@ SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="static-libs" +NASM_DEPEND="dev-lang/nasm" RDEPEND="!media-libs/jpeg:0" DEPEND="${RDEPEND} - dev-lang/nasm" + amd64? ( ${NASM_DEPEND} ) + x86? ( ${NASM_DEPEND} ) + amd64-linux? ( ${NASM_DEPEND} ) + x86-linux? ( ${NASM_DEPEND} )" + +DOCS=( BUILDING.txt ChangeLog.txt example.c README-turbo.txt ) src_prepare() { elibtoolize @@ -25,16 +31,15 @@ src_prepare() { src_configure() { econf \ - --disable-dependency-tracking \ $(use_enable static-libs static) \ --with-jpeg8 } src_compile() { - emake || die + default cd ../debian/extra || die - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" || die + emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" } src_test() { @@ -42,12 +47,11 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die - dodoc BUILDING.txt ChangeLog.txt example.c README-turbo.txt + default find "${D}" -name '*.la' -exec rm -f {} + cd ../debian/extra || die emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \ INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install || die + install } |