diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2008-12-07 13:41:52 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2008-12-07 13:41:52 +0000 |
| commit | 0d4b22a6234f9d8dc8f89e12025e4cc31bca83cc (patch) | |
| tree | dc6910122402ba6b33daec1367ac2192ded8edaa | |
| parent | Use mirror://berlios (bug #218657). (diff) | |
| download | historical-0d4b22a6234f9d8dc8f89e12025e4cc31bca83cc.tar.gz historical-0d4b22a6234f9d8dc8f89e12025e4cc31bca83cc.tar.bz2 historical-0d4b22a6234f9d8dc8f89e12025e4cc31bca83cc.zip | |
Pick up CFLAGS in src_compile instead of src_unpack, bug #240800
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.7 i686
| -rw-r--r-- | media-gfx/optipng/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/optipng/Manifest | 10 | ||||
| -rw-r--r-- | media-gfx/optipng/optipng-0.6.2.ebuild | 14 |
3 files changed, 19 insertions, 10 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/Manifest b/media-gfx/optipng/Manifest index f057ec144630..7de3445b1c3e 100644 --- a/media-gfx/optipng/Manifest +++ b/media-gfx/optipng/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST optipng-0.6.2.tar.gz 1052509 RMD160 cd9ecfbd1c8901d14cb93fbc9f07403071cea37e SHA1 374b3537a262590ba2822f2b10d9241247b4da95 SHA256 84312506ea0c683a4e7675b3c8278067222762520016cc61e53c2b0e679120ca -EBUILD optipng-0.6.2.ebuild 931 RMD160 6823049ddfff59ca4f6eb85fcd9d06557370ab4c SHA1 fd876521178f23425170330f1a800ca36911e2b4 SHA256 bf9a3f53cdd0f28f1da94ace8229c3d751bfcdba97db6ce4d488844e1d1e2702 -MISC ChangeLog 5610 RMD160 c452ecb964a3f3887ba9eb608e6cbba77b742531 SHA1 89ebd9593720d078f48412123686b54f500fd4ac SHA256 2e29eaa2f32bbd8d8688b6488cae0014f83a80566b0ea4d1bda6f06d65415866 +EBUILD optipng-0.6.2.ebuild 1017 RMD160 cb56da1fd4baf6aecb1c4b6e2a9a577d19ce5ba2 SHA1 a9238e05fec5955c2570cc62b8322963526938df SHA256 9765807bc34680e06c08a19081f7b260b832b1bf3ceda7644f53accb7ce168f6 +MISC ChangeLog 5742 RMD160 7f652d9108365a6362811bb3734a418e4ca780ef SHA1 eb2bcd9e235ab8fae9a7b9191b7d11c619721db4 SHA256 6fcd7e1ef99b0821a752eb47edde98905954b7b595bc526ebca4d9ddb800a35a MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkqelwACgkQdz7hIScOUREx6ACg6wD/1Demqm7nPnYddOdMY2W3 -g9IAn2lTmThibdB3ARYbhv2CxTC5cnji -=Z/8T +iEYEARECAAYFAkk70qgACgkQdz7hIScOURFp/QCgv36aOXP7rPkUhC0oJ5F0r61J +7HYAoMAuJU+89lbbEQXyEvxXmVwBdz51 +=18Ka -----END PGP SIGNATURE----- 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() { |