[proaudio] [2438] zynaddsubfx-99999999: fixed compilation with -j1 (upstream bug); fixed compilation of external programs, they now use a Makefile; added our compiler and CFLAGS to external programs

[subversion@xxxxxxxxxxxxx]

Revision: 2438
Author:   dominique
Date:     2013-02-03 18:29:49 +0100 (Sun, 03 Feb 2013)
Log Message:
-----------
zynaddsubfx-99999999: fixed compilation with -j1 (upstream bug); fixed compilation of external programs, they now use a Makefile; added our compiler and CFLAGS to external programs

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
    trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
    trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r8.ebuild
    trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
    trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
    trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild
    trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild
    trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog	2013-02-03 17:04:01 UTC (rev 2437)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog	2013-02-03 17:29:49 UTC (rev 2438)
@@ -1,7 +1,12 @@
 # ChangeLog for media-sound/zynaddsubfx
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2013; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  zynaddsubfx-99999988: add -j1 to emake (doesn't compile otherwise);
+  fixed the compilation of the external programs to use emake;
+  added our compiler and CFLAGS to external programs
+
   28 Dec 2012; Karl Lindén (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
   zynaddsubfx-2.2.1-r8.ebuild, zynaddsubfx-2.4.0.ebuild,
   +zynaddsubfx-2.4.3.ebuild, zynaddsubfx-20070707.ebuild,

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest	2013-02-03 17:04:01 UTC (rev 2437)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest	2013-02-03 17:29:49 UTC (rev 2438)
@@ -13,12 +13,12 @@
 DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
 DIST ZynAddSubFX-20070707.tar.bz2 206680 SHA256 036482f2aa68fc25b9bd8426032c458dcf46052ab9cde12ab30279126b0db4fa
 DIST zynaddsubfx-patches-2.tar.gz 6423 SHA256 b0d0f784940b647dcd2e3cfc4c0f1faba344f33e2ae568dd7c8bd97af0abb7b3
-DIST zynaddsubfx-presets-0.1.tar.bz2 27052 SHA256 b2fc41cc8b45531007270efd81536c9a99a6a169d2433ec12d3d6854cb9a10d6
-EBUILD zynaddsubfx-2.2.1-r8.ebuild 3157 SHA256 ebbe74b69597a4c6c60f016d4c0a2a21037e8f07ddfc729c6ccffb3d9cc99196 SHA512 08fa3410194bd73ae7b91de7d975ab249cb9c159c796544d92f9d344c8fcacdb2d8cffe97abad8220d74e925109b9a14b7bd565fdb8f15f61f1318fd7c016782 WHIRLPOOL ee2ad6663e7eab71deb04b616bc0ab0f1b94eb072113c10f1737f6c19fef4f47daea06e00e10517aeb0db66e6f676cad4e92767257baf7deb3381bfcabcb03dc
-EBUILD zynaddsubfx-2.4.0.ebuild 2733 SHA256 091138f14d49d6ed19c1dee7b5a4f37c47bd2aedbd306177fc9bc31da0b53323 SHA512 472279effed00e2d43c697dfec1e347e157973cbee664fab339704b76b04d4971ea272b9a1f4fa261b58269eafe4534da17bc224a3edc284d7c9354e26830b39 WHIRLPOOL 2ebb640fa281e1a495564c9d119f9754334be3880752421a7d646dde1df014e1a009e93c8eab01acf18bbac074181d59c2e84c3adaf8191b2c919f2831bae294
-EBUILD zynaddsubfx-2.4.3.ebuild 1585 SHA256 824892fa13b67f55edc57ebf458b36269e0b99bf7cf795ea656d1ee18268616a SHA512 62ea64d8e19511c999032ab3e0af635ed9b8e38913ad58ae28cef9f7d42599b3f895b257edaa407943ca43cda9e4b5ec8e6394c6ec79aa41b4e651bbf3ad893e WHIRLPOOL a5309a39541c1bfe4654efe71e249549eb7dd5089c579dc83223016634a0af9fbe40d86e1fba4d5dad4c68776ee022985e980f561bef7afc45179aee459054c8
-EBUILD zynaddsubfx-20070707-r1.ebuild 3094 SHA256 931567b4c7219440f40344b996c4d7ecd8b17304d28f00ab99dc8b965a5d3fec SHA512 eb8608d3a08ce847959289524fbd107420d95e77f6e87b58c4155cc0afc37ef77c794f3c107e5c1ea680c7ec2e2fb045b5b6ab4f866bc596ad9bcfe0cfbe6860 WHIRLPOOL 2687ec329bc8e60a48843eabcf3c01b9298c9b7d7349d30c2da67621d0390a004012619cbae5877f8c3bf3050feddc634d236686266f9b06669807a971e49bbd
-EBUILD zynaddsubfx-20070707.ebuild 3018 SHA256 938304acd807986f3cb5f7c5f08274abb40829bd0ed69c4719a3aa3e14db1efc SHA512 08a0a99f6c05c917623870c98c439219b885a00fc216d9ecb420f3c81604df1cf22fce5ae1a4913330423e1020facef2d90e5eafe13f1ac5257911d8cd759351 WHIRLPOOL 34baa565d979b56425584e9fb9b4c40864b714eaa62ccb384bf4ad20308b77beb4a3cedf3fbd50b53895f01a364f5115e0a7a5618dbe56a62c5792ed667a6fdc
-EBUILD zynaddsubfx-99999999.ebuild 3353 SHA256 4f1cd3c9e405efe28240eb5392cb6cab6ff144447f59ddbc2f48ef4d91229dcd SHA512 07eb14dfcbdaa867cc39388dae51e6f88eacdb5e3afe73fa8bef443b380f3f492c92601143f15a8824a120502308d86d915010bf694d8d21bda4cc69bd868908 WHIRLPOOL 2e0ae159bff6d839d7b07a23240ee24fc05b3bb08c8dec256bf22ebff433051f06fa4259aa3541c022b43788cd6f47a54e0418914e81f1ecbbab1976df999e43
-MISC ChangeLog 1847 SHA256 eaa0030defe0c21696c6a799791c33c42b88617cb04173700541c80bb4e3f464 SHA512 0f5399fefa21e70648c2f6024a368ca76c9975f4011499a86dad54a24f28bb78ce8c47a1a5427881b793706573bf37de153de0f4b40f2491ff7d5371af2649d8 WHIRLPOOL 0931bad4483a5d3ac2a76cfb244a438a82d436e15ddf68480340d1ca8eaa5aaf451c4728f3a8668a718282dad6f027da0afee748c6271096cdbcbd77fa0fc78a
+DIST zynaddsubfx-presets-0.1.tar.bz2 27052 SHA256 b2fc41cc8b45531007270efd81536c9a99a6a169d2433ec12d3d6854cb9a10d6 SHA512 63cbe5306d01a325958cdcb8938a517944f6ab33c6a1eb8f9986dc26fabc8e0d3b32be14d2cf0ec4b30b3b594880fa478478367b6657545a3a0b6d1ae7ed3626 WHIRLPOOL 582674fbdfe7b770b93a6559c38bb79f718aa042e6f9795dbac8d5821f50ef1caa1655e71c350f28b7f7a8f94151bb07365d20896dd5101f925af56e21b993fc
+EBUILD zynaddsubfx-2.2.1-r8.ebuild 3157 SHA256 148e8466a6a4e6c0193aec1dfbcf7c52ed744c9e5aea02cf98cbac5f34d22f59 SHA512 054e7e1dc84195a39a3f40a3e5241afa7d491f1f63046895a643ae1a958de48cafa8bcac73fee256abd6fcad693f9fea734d36f8bffad8a3e251c20fce5d6339 WHIRLPOOL faf2ed9802adaf70deb13a347f8cf2383c368f20995ff0353e6e89aec089571f3e5a1041ed0be5846f951119ee1c83b31ea7d3356b1409bc5658029aadb8caa3
+EBUILD zynaddsubfx-2.4.0.ebuild 2733 SHA256 1db058464596dc84a60ca88997ecd6489df61542383f23202133b5483cf6333f SHA512 6ac350babf2a1d550e7961b5b88792a357e02a12d4ebeabe219430b8236b4ee26b9e2e07e7144bd9e7489e35fcc49b8ed634b368a2450072f4dc449eef6b9a51 WHIRLPOOL f94a9a25bee1467af460618d960c4653fa27480a601b97766c4ad9b9ccb728719646a53d7275f28f919b7149705c2a2f596968f57b5e5096760f1b1bbad91aa8
+EBUILD zynaddsubfx-2.4.3.ebuild 1585 SHA256 9773e2ffd8d4373399d59ac748925b5f483f66dbc21712513c7129264a275d49 SHA512 0e19c3a50bdc6b4a684f74788f207b49a0bdb363d1b774c8d4c42c4e37252b30eba58c020addcd98baccacf9f7657812e7ab626c98289f7157c2a1caaeb6b1b1 WHIRLPOOL 58c2cfe80d2c94b7872d7051e20e6726365eeb4f0003e486528463989ac426fc5ac8c6ef36b407bfb89a0e5d82e3b5e26148a39f6dd804dea1f4aa0ae47cf92f
+EBUILD zynaddsubfx-20070707-r1.ebuild 3094 SHA256 feaa56afa960ec2d51fb0e62629e98ce202646a4afee04dd4ec18a27e46e23e2 SHA512 9a4de8f8fddc497f0396ad43a85ef4b3d2c1a3aea68d903d045edf98999abd0fec06ce020a9120ab24907767b202f23cc5700d5f2c43e47d24f167b358fec620 WHIRLPOOL b507af8cf295e4e351eb7bb74d8e4ae5b83bbc4669c187e6b305522c56b5546ba641c251663c96f89999e0dc259bc9277a409002d9d0665c784b3384ba706d34
+EBUILD zynaddsubfx-20070707.ebuild 3018 SHA256 ed9aae5e87f2fc3b0c796647331b214f7058e1368196fe976d81b5977250fd1c SHA512 f56b55ace1360c8b21bd6e97441b057a8c3a32a12a42a2bf5b0593fcfa4cac05d9c4336aff4757b48ef0710cf8677d5f0b8116711bbfd6c196ecaa6e10b39348 WHIRLPOOL b366f5ba35a95231cb96032c26702c09619a874f177e852224eb216055e1cd73793b622fa75fda7ed2be2c4c9ec4297f2b2e778472beeb9ac31127a8396a36a4
+EBUILD zynaddsubfx-99999999.ebuild 3567 SHA256 4dbb9ed6c0effdf6af0411ff6d12b0b91f4174df99d1686d69c75386ee2a2b61 SHA512 7a649238734c847d774e480be4751170ef3c205f84ae555fd6c8b7ecf61d668359264f3f3b15c497b110f1e83ac53cad8d7b4a73181a3d6e2ab862d8e815a195 WHIRLPOOL 509d9cbfeada744c5ff427e689890af03fdcbeff3fb2c8f691ddebd17b02c400f2238764069f10ab1d4940b712e508b9fdd6c3bd689a8a039da5e5ad86989763
+MISC ChangeLog 2100 SHA256 c9702e30ab86850895598fb0c0ab8a45327364e34126046b34d920426adb79c6 SHA512 cdcacef4a060b40c5514f8232b044af228bea281b7c650bd4dd85c7ad8299bf71b2d5288d260020886e052b91c52ab7c8d543ae83819144a3e8985f223d3b562 WHIRLPOOL 0b87e2ce9c03b7ea426ff06532fed40dd86a3c12cd56d08bcfa1e3c95549cb4e418ef7f6c842ce5b685dfc0bb42eac91efd78d78f8ca0944ab612bc0d522b879
 MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r8.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r8.ebuild	2013-02-03 17:04:01 UTC (rev 2437)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r8.ebuild	2013-02-03 17:29:49 UTC (rev 2438)
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild	2013-02-03 17:04:01 UTC (rev 2437)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild	2013-02-03 17:29:49 UTC (rev 2438)
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild	2013-02-03 17:04:01 UTC (rev 2437)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild	2013-02-03 17:29:49 UTC (rev 2438)
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild	2013-02-03 17:04:01 UTC (rev 2437)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild	2013-02-03 17:29:49 UTC (rev 2438)
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild	2013-02-03 17:04:01 UTC (rev 2437)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild	2013-02-03 17:29:49 UTC (rev 2438)
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild	2013-02-03 17:04:01 UTC (rev 2437)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild	2013-02-03 17:29:49 UTC (rev 2438)
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit exteutils cvs patcher jackmidi
+inherit exteutils cvs patcher toolchain-funcs jackmidi
 RESTRICT="mirror"
 
 MY_P=ZynAddSubFX-${PV}
@@ -51,6 +51,9 @@
 	# add our CXXFLAGS
 	esed_check -i "s@\(CXXFLAGS.\+=.*OS_PORT.*\)@\1 ${CXXFLAGS}@g" Makefile
 	esed_check -i "s@&master->mutex@\&master->processMutex@g" main.C
+	# add compiler and CFLAGS
+	esed_check -i "s\gcc\\$(tc-getCC) ${CFLAGS}\g" "${S}/ExternalPrograms/Spliter/Makefile"
+	esed_check -i "s\gcc\\$(tc-getCC) ${CFLAGS}\g" "${S}/ExternalPrograms/Controller/Makefile"
 }
 
 src_compile() {
@@ -85,12 +88,12 @@
 	echo "make ${myconf}" > gentoo_make_options # for easier debugging
 	chmod +x gentoo_make_options
 
-	emake ${myconf} || die "make failed with this options: ${myconf}"
+	emake -j1 ${myconf} || die "make failed with this options: ${myconf}"
 
 	cd "${S}/ExternalPrograms/Spliter"
-	./compile.sh
+	emake
 	cd "${S}/ExternalPrograms/Controller"
-	./compile.sh
+	emake
 }
 
 src_install() {