diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2008-12-07 13:41:52 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2008-12-07 13:41:52 +0000 |
| commit | f35d4a90e73f789900d47e991e3519055f2c5a87 (patch) | |
| tree | 58267278d41f20fb1ca5528c75c2313ae02a2d55 /media-gfx/optipng | |
| parent | Use mirror://berlios (bug #218657). (diff) | |
| download | gentoo-2-f35d4a90e73f789900d47e991e3519055f2c5a87.tar.gz gentoo-2-f35d4a90e73f789900d47e991e3519055f2c5a87.tar.bz2 gentoo-2-f35d4a90e73f789900d47e991e3519055f2c5a87.zip | |
Pick up CFLAGS in src_compile instead of src_unpack, bug #240800
(Portage version: 2.2_rc17/cvs/Linux 2.6.27.7 i686)
Diffstat (limited to 'media-gfx/optipng')
| -rw-r--r-- | media-gfx/optipng/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/optipng/optipng-0.6.2.ebuild | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog index d5838035726b..cf412a184953 100644 --- a/media-gfx/optipng/ChangeLog +++ b/media-gfx/optipng/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/optipng # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.44 2008/11/15 18:16:43 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.45 2008/12/07 13:41:52 nyhm Exp $ + + 07 Dec 2008; Tristan Heaven <nyhm@gentoo.org> optipng-0.6.2.ebuild: + Pick up CFLAGS in src_compile instead of src_unpack, bug #240800 15 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org> optipng-0.6.2.ebuild: diff --git a/media-gfx/optipng/optipng-0.6.2.ebuild b/media-gfx/optipng/optipng-0.6.2.ebuild index cbbc70f92c68..d43293413af5 100644 --- a/media-gfx/optipng/optipng-0.6.2.ebuild +++ b/media-gfx/optipng/optipng-0.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.2.ebuild,v 1.4 2008/11/15 18:16:43 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.2.ebuild,v 1.5 2008/12/07 13:41:52 nyhm Exp $ inherit toolchain-funcs @@ -17,8 +17,8 @@ src_unpack() { unpack ${A} cd "${S}" sed -i \ - -e "/^C/s: -O2.*: ${CFLAGS} -Wall:" \ - -e "/^LD/s: -s$: ${LDFLAGS}:" \ + -e '/^C/s: -O2.*: $(GENTOO_CFLAGS) -Wall:' \ + -e '/^LD/s: -s$: $(GENTOO_LDFLAGS):' \ src/scripts/gcc.mak \ lib/libpng/scripts/makefile.gcc \ lib/pngxtern/scripts/gcc.mak \ @@ -26,7 +26,13 @@ src_unpack() { } src_compile() { - emake CC="$(tc-getCC)" -C src -f scripts/gcc.mak || die "emake failed" + emake \ + -C src \ + -f scripts/gcc.mak \ + CC="$(tc-getCC)" \ + GENTOO_CFLAGS="${CFLAGS}" \ + GENTOO_LDFLAGS="${LDFLAGS}" \ + || die "emake failed" } src_install() { |