diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2009-12-12 13:58:37 +0000 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2009-12-12 13:58:37 +0000 |
| commit | b7bf3e449dbbc23b83fbf7de86aea237c9944088 (patch) | |
| tree | c4079132d0451ffa114ba8964fedc9a5ee93d70c /sys-apps/lcdtest | |
| parent | Version bump, remove 0.* ebuilds (diff) | |
| download | gentoo-2-b7bf3e449dbbc23b83fbf7de86aea237c9944088.tar.gz gentoo-2-b7bf3e449dbbc23b83fbf7de86aea237c9944088.tar.bz2 gentoo-2-b7bf3e449dbbc23b83fbf7de86aea237c9944088.zip | |
Reorder build sequence, improve visual feedback of build process. Respect LDFLAGS. Address inadvertent build breakage reported by Andrew Savchenko in bug #296556.
(Portage version: 2.2_rc58/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/lcdtest')
| -rw-r--r-- | sys-apps/lcdtest/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/lcdtest/lcdtest-1.08-r1.ebuild | 13 |
2 files changed, 13 insertions, 7 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/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 $? } |