From: Jesus Rivero Date: Wed, 14 Jul 2010 00:08:37 +0000 (+0000) Subject: Reverted change to emake -j1. Parallel make does not work. Closes bug #326493 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9b92db996b0cd29c4cca79f2f5f3b3655fb3812b;p=gentoo.git Reverted change to emake -j1. Parallel make does not work. Closes bug #326493 Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest index 4437791b0c5c..af91e5c679cc 100644 --- a/app-accessibility/festival/Manifest +++ b/app-accessibility/festival/Manifest @@ -29,13 +29,13 @@ DIST speech_tools-1.2.96-beta.tar.gz 1275015 RMD160 3d2acc841a8b14e0bff66c9bb082 DIST speech_tools-2.0.95-beta.tar.gz 1681824 RMD160 ccb1f249924885c0b0c831bb0bc0c9f6a7279fbb SHA1 d3f13f0f66f763e80c73eb26f07b86572944ba2a SHA256 61f6786468872aeb2ba0db3ba8c42dd23dfba95467b9fb30cc4f3d92a956b554 EBUILD festival-1.96_beta-r1.ebuild 5171 RMD160 b1e6a7fef2bc1a9e61e5e597fe6db3fceb70259f SHA1 33d8ed1c405059dbdda5ea4bcfd27d5d39703681 SHA256 04eab2f2a9c744651b56770f8f1541d3153ff34a7bf8d115b8dff7f33e48452d EBUILD festival-1.96_beta.ebuild 5057 RMD160 9bad4911adae9c6214d23bc4ca7511b755efc78b SHA1 cf356f4080f60deee236d600c9713d0bce29a3eb SHA256 31c9906b914e472eadfdf4d3db12acc1c1d415016a06b595acbc10de43c18a77 -EBUILD festival-2.0.95_beta.ebuild 4017 RMD160 7589e584fec9b73ccefd696d54244cc225631add SHA1 2d3e96f80214660e8b1136632d4865b0cf7e7bf9 SHA256 5ccf483a9f14a2f6b10dcc9c64dd0f4730c2892824436fc9ff7a37158c0a1ac3 -MISC ChangeLog 17344 RMD160 f2243d021ed6c6fd16e30680603d7a78376a8a7b SHA1 37262aabcb6f00d38a9d276b2b0bae534a5c0441 SHA256 60878da41eca3494d45f2762f1d156aa9e9f4c5a7643dda3cadf4620ab88594d +EBUILD festival-2.0.95_beta.ebuild 4021 RMD160 2c03999d151c8fa7be15aefce112386db13a956f SHA1 3b520be6f81f02f67572c91ee6860365fec75b1c SHA256 3661c64c054025e7cf37b74835079ab7815dee89a63607998e84f8dfac06f041 +MISC ChangeLog 17509 RMD160 78d4d460789074b7676e078dc0854f2409375898 SHA1 0abca7547a7c4dc00cb0a85a0850c491df6f735f SHA256 bd05ce3f7b92d9840030eb50890d16a1953026c0ad0fb472ca96e3704c43c191 MISC metadata.xml 321 RMD160 85d595924e5c87d59427af1f743c76c62cb08eb1 SHA1 f1b34f3b131295eda78d168d1fcebecf3d1d0ada SHA256 54fb73517995daec7601b063031a9021800c7d8fdcc73d969060b7447f0ce6d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkwrUDAACgkQdIssYB9vBoNl8ACcCQPxxNdM6bWRQG7h8FC8ugto -ko8An2HIyKcnGM4AMKqT+bOenLxurPOP -=aCYr +iEYEARECAAYFAkw8850ACgkQdIssYB9vBoPoyACfQH6LeP6RPGDOo1i9i3tW/xaD +dP4AnivI8QICRpYWx0sO+rM64Q0bEQC1 +=Qu7M -----END PGP SIGNATURE----- diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog index 26e84f73967a..5a7702820168 100644 --- a/app-accessibility/speech-tools/ChangeLog +++ b/app-accessibility/speech-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-accessibility/speech-tools # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.69 2010/07/01 12:39:22 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.70 2010/07/14 00:08:37 neurogeek Exp $ + + 13 Jul 2010; Jesus Rivero + speech-tools-2.0.95_beta.ebuild: + Reverted change to emake -j1. Parallel make does not work. Closes bug + #326493 01 Jul 2010; Samuli Suominen speech-tools-1.2.96_beta-r2.ebuild, speech-tools-2.0.95_beta.ebuild: diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest index bbf6817a04bc..689e1872b0eb 100644 --- a/app-accessibility/speech-tools/Manifest +++ b/app-accessibility/speech-tools/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX speech-tools-1.2.96_beta-gcc42.patch 2203 RMD160 c2bb3d7cec0c9449b4480a45675057acc4a8ef8c SHA1 3cf29f9dcb9fdfd90249003b7eca9d71a88b8219 SHA256 4bc724774e4223448bb1bbd202fe6055580abd62d11ffab470843e1351c45e9e AUX speech-tools-1.2.96_beta-gcc43-include.patch 878 RMD160 fb89c84949548cfdc49ddff50a7129ea63dc9b2d SHA1 afb2ecfacc123411acb7e82ae9b7c707bd32b922 SHA256 dd050d6556b484ecd494dd080c8b917fcc08c264260c4850d5392986f492febe AUX speech-tools-1.2.96_beta-gcc44.patch 579 RMD160 389950e6e9e8444acfaa7c647519cf488d38e89c SHA1 3389cad0757b5239be7caba00d412c625e3e49d0 SHA256 720cb246c3845779291038e945e09024370b3478d3e84416886efb9263f490bf @@ -7,6 +10,13 @@ DIST speech_tools-2.0.95-beta-patches.tar.gz 5773 RMD160 2b781434bae545425af4a2e DIST speech_tools-2.0.95-beta.tar.gz 1681824 RMD160 ccb1f249924885c0b0c831bb0bc0c9f6a7279fbb SHA1 d3f13f0f66f763e80c73eb26f07b86572944ba2a SHA256 61f6786468872aeb2ba0db3ba8c42dd23dfba95467b9fb30cc4f3d92a956b554 EBUILD speech-tools-1.2.96_beta-r2.ebuild 3062 RMD160 4aef36d48a788889b71d76edb13cefcbf478b647 SHA1 82a74fe507a39b2d307d73fa4694e3238261ca30 SHA256 5814021c5378e4193f5a6cf3aad56f4c84c2ec41e9acb9c95bf175b0e005adfc EBUILD speech-tools-1.2.96_beta.ebuild 2801 RMD160 4d69f662118f44891e82e5a1d9baae38b3b074aa SHA1 4e366f2228e6892b370d5444913c5fd527e7c567 SHA256 9f87ae7a32433603744490de14c1bba8ae2fd2289d779a9b47e6eccc98caa297 -EBUILD speech-tools-2.0.95_beta.ebuild 3166 RMD160 062afb5ae89d6f63b82fbbe5bfdf5c3383e45dac SHA1 33146f928ccfdc4a6c81282ee798a1950b4cd02e SHA256 6ca7a9ffcc404e43a34d4b544d258b379ad2772b28ee80a92770e5b60669c628 -MISC ChangeLog 11249 RMD160 68f60c13d014aad9ee0d93ac252da0f8fc64574f SHA1 aa11f967fcb4dec0037cbaec8a4db32fcf2d84d7 SHA256 bafa7f6c08252a2754b4dc245d1e935807455dfe9376e5f218096c0ec33a54c9 +EBUILD speech-tools-2.0.95_beta.ebuild 3034 RMD160 25af5a043a4f27ff7e3f7c566ab09ea465620eb1 SHA1 9f8b4f868f1cd2fd8f2e7b337bc03b7dfef839e1 SHA256 52deae4b24c6eac0cfaacb280a5955157dbd1abf42328d00dc7eac329c8377e6 +MISC ChangeLog 11418 RMD160 144143e5c5041ef0c2e63f24962de41aceffd644 SHA1 aad13d22ea087a4a3ac9a38c35be436647e09c7f SHA256 9cf2052d7dadc756a1b6720cadcdab6d5b7280747077246d1439fc460c12c2d6 MISC metadata.xml 249 RMD160 b4704f1b46f70badf05ac1549e9feaf260041a08 SHA1 901e48e020cb6dcb722212410e1ac34212e87cf0 SHA256 7bce1abcec735751c95b28394f348e421b525ead1ba86638fc5f884217cdb49a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkw88tUACgkQdIssYB9vBoP8+wCfS7vlQR3AOUWIUfLtZvgYNtDU +gCIAnA3oWZWDkLND5GbviHEeXefa9EtP +=5r+6 +-----END PGP SIGNATURE----- diff --git a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild index 709056ecd6e9..93796a07ec1d 100644 --- a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.2 2010/07/01 12:39:22 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.3 2010/07/14 00:08:37 neurogeek Exp $ EAPI="2" @@ -49,9 +49,7 @@ src_configure() { } src_compile() { - #emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CC_OTHER_FLAGS="${CFLAGS}" \ - # OPTIMISE_LINKFLAGS="${LDFLAGS}" || die "Compile failed" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CC_OTHER_FLAGS="${CFLAGS}" \ + emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CC_OTHER_FLAGS="${CFLAGS}" \ OPTIMISE_LINKFLAGS="${LDFLAGS}" || die "Compile failed" }