summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2009-12-12 13:58:37 +0000
committerTony Vroon <chainsaw@gentoo.org>2009-12-12 13:58:37 +0000
commit14ce82b7e3fc783036083bd09e412426316abbd9 (patch)
tree2f0dd2c6eef4f7eeb943af357dd84a3ee5e0449f /sys-apps
parentVersion bump, remove 0.* ebuilds (diff)
downloadhistorical-14ce82b7e3fc783036083bd09e412426316abbd9.tar.gz
historical-14ce82b7e3fc783036083bd09e412426316abbd9.tar.bz2
historical-14ce82b7e3fc783036083bd09e412426316abbd9.zip
Reorder build sequence, improve visual feedback of build process. Respect LDFLAGS. Address inadvertent build breakage reported by Andrew Savchenko in bug #296556.
Package-Manager: portage-2.2_rc58/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/lcdtest/ChangeLog7
-rw-r--r--sys-apps/lcdtest/Manifest12
-rw-r--r--sys-apps/lcdtest/lcdtest-1.08-r1.ebuild13
3 files changed, 19 insertions, 13 deletions
diff --git a/sys-apps/lcdtest/ChangeLog b/sys-apps/lcdtest/ChangeLog
index 1948bab8f171..09ce324d2a7d 100644
--- a/sys-apps/lcdtest/ChangeLog
+++ b/sys-apps/lcdtest/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/lcdtest
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/ChangeLog,v 1.16 2009/12/07 00:30:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/ChangeLog,v 1.17 2009/12/12 13:58:37 chainsaw Exp $
+
+ 12 Dec 2009; <chainsaw@gentoo.org> lcdtest-1.08-r1.ebuild:
+ Reorder build sequence, improve visual feedback of build process. Respect
+ LDFLAGS. Address inadvertent build breakage reported by Andrew Savchenko
+ in bug #296556.
07 Dec 2009; <chainsaw@gentoo.org> lcdtest-1.08-r1.ebuild:
QA audit as requested by Tomáš "scarabeus" Chvátal on #gentoo-dev;
diff --git a/sys-apps/lcdtest/Manifest b/sys-apps/lcdtest/Manifest
index 7965a42478bd..a8afb4eb9a2f 100644
--- a/sys-apps/lcdtest/Manifest
+++ b/sys-apps/lcdtest/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
AUX 1.08-help-option.patch 360 RMD160 2e8addce02be99e57d1b9cb0931f5fc8383cc9e7 SHA1 bfbf591faee8dd8c235119739f9f6ee29c64ceac SHA256 246cf965102e548403cb115c85079132b7a3c71c2536718d783143dfc61ce580
DIST lcdtest-1.08.tar.gz 30762 RMD160 bad9b9a8e8f5138f043812fff397db6cde54e160 SHA1 9ad88e26fc2273e4f75d977b64422f8624fe0b3c SHA256 f4cc00b90505ccc2f379d0f481a761ca11f7622abbb078430b595cf3aa287d29
-EBUILD lcdtest-1.08-r1.ebuild 1726 RMD160 b1c9da01c673d064123362def1e8e96f8de641ab SHA1 33bec47153e286d36822572aea635970e6a89c94 SHA256 802663be38315b844fec47b1efa2e85dc8b629bf24a1ec0b9e825403f5e677d7
-MISC ChangeLog 3174 RMD160 c2f581a8f88a053980af6061f6341587e07bbd7a SHA1 a2dc283bf56b333fb30f75c23f7ea6cc31ce6d8f SHA256 85766903b607672a8d47438e46ded6508d94edf97c9472c57980436d1c6157a4
+EBUILD lcdtest-1.08-r1.ebuild 1751 RMD160 6c3ac34ba4314b344ebedc419772cf0e71aca14b SHA1 c08d35155074bbdb3b4e1dbdf9b5ec7b62479ec0 SHA256 c76c1e766694b084ad97da008403f1ca56b5391d92d4419f4c9e20c89f2d83fd
+MISC ChangeLog 3405 RMD160 5296a685b7c403a2b127c528b192a9a8fc980363 SHA1 02e24ce99329549cf722ad018640ce56f3e9105d SHA256 042958909b09095ad163ae6b52fe190c05a3845d0205d3661fb0af70f031ffbc
MISC metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a SHA1 de5f6d0faac7d5f11daa399f9e875c30cac2ce64 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
-iEYEARECAAYFAkscTNQACgkQp5vW4rUFj5qQhwCfRiTcjVCB4jj421tvrV0EdoKL
-DBQAmQHmc7QFfjJgfWPVIIdvWnk6Qf4D
-=aDsi
+iEYEARECAAYFAksjoa4ACgkQp5vW4rUFj5ohJQCfcXCLy1a180OVk/ccUKRBv0o1
+xzcAn3v88P6UsGGJZDGnbxiYHk07sx6U
+=5M21
-----END PGP SIGNATURE-----
diff --git a/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild b/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild
index afc44b5d8c9d..268880df9a9b 100644
--- a/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild
+++ b/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild,v 1.8 2009/12/07 00:30:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild,v 1.9 2009/12/12 13:58:37 chainsaw Exp $
inherit eutils toolchain-funcs
@@ -26,17 +26,18 @@ src_unpack() {
src_compile() {
tc-export CC CXX
cd "${S}/src"
+ einfo "Generating font"
+ pngtopnm 14P_Arial_Plain_Red.png > help_font.ppm || die pngtopnm failed
+ ppmtoxpm -name `basename help_font.ppm .ppm`_xpm help_font.ppm 2>/dev/null |
+ sed 's/static //;s/black/#000000/;s/magenta/#FF00FF/;s/#E40808/#009900/' > help_font.c || ppmtoxpm or sed failed
+ eend $?
ebegin "Running first stage compilation"
"${CC}" -o lcdtest.o -c ${CFLAGS} -DRELEASE=${PV} lcdtest.c || die lcdtest compilation failed
"${CC}" -o SFont.o -c ${CFLAGS} -DRELEASE=${PV} SFont.c || die SFont compilation failed
eend $?
- einfo "Generating font"
- pngtopnm 14P_Arial_Plain_Red.png > help_font.ppm || die pngtopnm failed
- ppmtoxpm -name `basename help_font.ppm .ppm`_xpm help_font.ppm || die ppmtoxpm failed
- sed 's/static //;s/black/#000000/;s/magenta/#FF00FF/;s/#E40808/#009900/' > help_font.c || sed failed
ebegin "Running final stage compilation"
"${CC}" -o help_font.o -c ${CFLAGS} -DRELEASE=${PV} help_font.c || die help_font compilation failed
- "${CC}" -o lcdtest lcdtest.o SFont.o help_font.o -lSDL -lSDL_image || die final link failed
+ "${CC}" "${LDFLAGS}" -o lcdtest lcdtest.o SFont.o help_font.o -lSDL -lSDL_image || die final link failed
eend $?
}