diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-10 08:50:50 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-10 08:50:50 +0000 |
| commit | 7c768cb282b92f083f2a5d02c704a156477e8016 (patch) | |
| tree | e5e92eb5b710ae47f127559d0b0555dc07afdeda /sys-apps/fbset | |
| parent | Version bump 0.11.0 -> 0.12.0 (diff) | |
| download | historical-7c768cb282b92f083f2a5d02c704a156477e8016.tar.gz historical-7c768cb282b92f083f2a5d02c704a156477e8016.tar.bz2 historical-7c768cb282b92f083f2a5d02c704a156477e8016.zip | |
Fix parallel build properly, solves bug #421203.
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/fbset')
| -rw-r--r-- | sys-apps/fbset/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/fbset/Manifest | 25 | ||||
| -rw-r--r-- | sys-apps/fbset/fbset-2.1.ebuild | 11 | ||||
| -rw-r--r-- | sys-apps/fbset/files/fbset-2.1-build.patch | 21 |
4 files changed, 43 insertions, 20 deletions
diff --git a/sys-apps/fbset/ChangeLog b/sys-apps/fbset/ChangeLog index b019c87bdad7..ce096c346c02 100644 --- a/sys-apps/fbset/ChangeLog +++ b/sys-apps/fbset/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/fbset # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/ChangeLog,v 1.16 2012/01/31 16:12:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/ChangeLog,v 1.17 2012/07/10 08:50:50 flameeyes Exp $ + + 10 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> + +files/fbset-2.1-build.patch, fbset-2.1.ebuild: + Fix parallel build properly, solves bug #421203. 31 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> fbset-2.1.ebuild: Missing sys-devel/flex DEPEND wrt #376949, Comment #2 by Matt Sealey diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest index 8b2f348d97bb..3bab75924cab 100644 --- a/sys-apps/fbset/Manifest +++ b/sys-apps/fbset/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST fbset-2.1.tar.gz 27721 RMD160 4517560fd79d98ad71c94550eeefb1041ca56352 SHA1 141c42769818a08f1370a60dc3a809d87530db78 SHA256 40ff4ab0247b75138a0887ed40f81c1a6184f340b77126c16d074b1075b41c20 -EBUILD fbset-2.1.ebuild 996 RMD160 c0499c84b12d068822224d0447fb357a05f6eb29 SHA1 8419ea099511fe5fde350f78059b0d52f9706921 SHA256 34f8d5a618cbd25ff1b41c20f584b12bb1f4e8ad1cecdfe53950e2b356226844 -MISC ChangeLog 1830 RMD160 967e794fe6fb68670df8be10314030cc4bdb8bd5 SHA1 4c63359d4a81738ce7aa1943e161adaa763225ad SHA256 03c5fd1d888a5496b004088d1c6ba0522823cdd7154d54296cda42f2a4f19231 -MISC metadata.xml 224 RMD160 feb568b578b888bb1a208ef3c1302c877d5b7fb7 SHA1 bcce7e3df01f53ecf5e01edd7a39772dec9cc45f SHA256 4faffbdf0669222627d57d9614686ffe729da609af533c4dbd394682b2668e30 +AUX fbset-2.1-build.patch 458 SHA256 963e90bbe337983fa650f949f9ef484612753016132899ee3d42cd4d9bed8fc6 SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819 WHIRLPOOL c90d9d97bbda3f9a7c44b5b0c9947d265c92b4c2f324c89753a2573902921e590350546f440dbba30a3bad880fe8e4f3fd778025ccccf3b733a271a0982b8bd9 +DIST fbset-2.1.tar.gz 27721 SHA256 40ff4ab0247b75138a0887ed40f81c1a6184f340b77126c16d074b1075b41c20 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28 WHIRLPOOL a45b2b1031cd9fc626b318a4df1d697ccc710f86eeba9f7013b738a23f7910d4c73ca5b4bad8ed07a18cf5b60aa8d7a3dbb56424bf56a8346f2c7d94fd97d957 +EBUILD fbset-2.1.ebuild 889 SHA256 955d045cd56a98fa0b57473d474fa074965c4259c5daa33a21fd2bbbada5cba0 SHA512 0401b1867bab00f2ddef6f95eb4eb9aeb9c95ab1924c0e2afd72633f5b9d9cda3d4a00b6d8fbd4e949a377734cd13a4f149478df1cf597b1833ddc2ede30fe86 WHIRLPOOL 8857599f77fd390955b86301ac93f16c2560702464d0660229572cd2516772358dc2101569312d3cb4537d2f71f6496ad55333f6593fbbec6c387213f8f98830 +MISC ChangeLog 1988 SHA256 d2c46f5d315a74ad5a7e4b4e59f7824e8032af4f42e9201fd4e83db32c910a04 SHA512 248c24e29ae6e210f337ebb6a7cfecb4299f14552fbd9043c8941201081b72e64c28883764ec53e73a5ecdc17700241178e227a60a498b9237401a0dda094ea5 WHIRLPOOL 6cd43d79d251f9e8ac56c1e5a38fdaa6ef3eff37d11c18ee1037888ee644ce76db19f2eae6024a9c350caf89574757b986519d89366377d37ec9f359c9cf8f59 +MISC metadata.xml 224 SHA256 4faffbdf0669222627d57d9614686ffe729da609af533c4dbd394682b2668e30 SHA512 2d3ce1b0cb24feb29d267844065c0944e6cf0e2efcc643a910077bd273f57ba356aecada20e3e29d2d0c9f9a9edb9fab4deb23bd359a4c111b294d5d8be5df83 WHIRLPOOL b6d174354f09a274d045d5635b567f0aa13da94a2671f5cf5b7f1700de12296460d7fec7d200c60fa6738a2ce66223eb78d6f66ed1d2ba6973b432a778be1e45 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJPKBJhAAoJEEdUh39IaPFN544IAId7qvX302S5DJ0wMCcIj9d7 -bm1Jg8zMISqHgucaWAWwxp/Kk5mhStHc6mlVgs9uDpR+3VchCipRnaeKd1i+wgW8 -5goTduaLlkeR/XfcRONVndSqf89rJW/5kKsi/TzcW6Fl9/9K6M5lRNtEBuYpu+6B -0Zuo6sj00TQX/6KQYrwurPP90Glu8VNqQgJZTiKmBY5PXBKDTrPfcNYo2dPiuwRH -VeVWGpNjQtsQ0EC/0q+t9ymmYztktoAIU9XXIaK/XaAzYAITJ7Vgq1S4qOljbvzM -tAdAEkEPTKfvF7c2IL1yvteN6Ni2ognpHTvUxzdKOYgNca1oiiK+7XiGD6OUqNw= -=k1Kj +iQEcBAEBAgAGBQJP++z/AAoJEBzRPIrUMBNC/T4H/1THHuIRYydSvt2shf4YShSN +H+U6MLF5VMT5vETUGQCck2WQSZh8T162n96xLQtIO9WJ/f2KXioFxyFUFtc6vWFP +2v70c41z0zgo0kW0U+trQydSKSj2bOFdTX3pPvRv4s3/dy5ppxrgYxdNx4amVzD8 +Vqvchc2IxxjkL7y2kJHYOG/lP3Bo8d54+gQsBe7B+nNRPr1v2rDkakAPa9tjQhot +NSRdXGfNaoJQ9/dlJB3BZOQgucWV+FpFOlYRW9PLFZodwyuK7dsVbId3WdVX6IcF +1M38Ok46OIEf+lok9zAugcR7OqIQRX+yavpDUG5yIXMBYQeVBAxwK9oExMawvdI= +=BGVa -----END PGP SIGNATURE----- diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild index efe3e610c96b..a3d5ff2a34c2 100644 --- a/sys-apps/fbset/fbset-2.1.ebuild +++ b/sys-apps/fbset/fbset-2.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.34 2012/01/31 16:12:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.35 2012/07/10 08:50:50 flameeyes Exp $ -inherit toolchain-funcs flag-o-matic +inherit toolchain-funcs flag-o-matic eutils DESCRIPTION="A utility to set the framebuffer videomode" HOMEPAGE="http://users.telenet.be/geertu/Linux/fbdev/" @@ -20,15 +20,12 @@ RDEPEND="" src_unpack() { unpack ${A} cd "${S}" - sed -i \ - -e "/^CC =/s:gcc:$(tc-getCC):" \ - -e "/^CC =/s:-O2:${CFLAGS}:" \ - -e 's/^modes.tab.c/modes.tab.h modes.tab.c/' \ - Makefile || die "sed Makefile failed" + epatch "${FILESDIR}/${P}-build.patch" } src_compile() { use static && append-ldflags -static + tc-export CC emake || die "emake failed" } diff --git a/sys-apps/fbset/files/fbset-2.1-build.patch b/sys-apps/fbset/files/fbset-2.1-build.patch new file mode 100644 index 000000000000..94a323bb39ac --- /dev/null +++ b/sys-apps/fbset/files/fbset-2.1-build.patch @@ -0,0 +1,21 @@ +Index: fbset-2.1/Makefile +=================================================================== +--- fbset-2.1.orig/Makefile ++++ fbset-2.1/Makefile +@@ -2,7 +2,6 @@ + # Linux Frame Buffer Device Configuration + # + +-CC = gcc -Wall -O2 -I. + BISON = bison -d + FLEX = flex + INSTALL = install +@@ -20,6 +19,8 @@ lex.yy.o: lex.yy.c fbset.h modes.tab.h + lex.yy.c: modes.l + $(FLEX) modes.l + ++modes.tab.h: modes.tab.c ++ + modes.tab.c: modes.y + $(BISON) modes.y + |