app-misc/rbutil: Fixed parallel make issue (bug 183494), thanks to Dennis Schridde

svn path=/sunrise/; revision=11668

4 files changed, 63 insertions, 4 deletions

diff --git a/app-misc/rbutil/ChangeLog b/app-misc/rbutil/ChangeLog
index 3b25feed1..ca37ac98e 100644
--- a/app-misc/rbutil/ChangeLog
+++ b/app-misc/rbutil/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-misc/rbutil
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jan 2011; Laurento Frittella (mrfree) <laurento.frittella@gmail.com>
+  +files/1.2.8-fix-parallel-make.patch, rbutil-1.2.8.ebuild:
+  Fixed parallel make issue (bug 183494), thanks to Dennis Schridde
+
   04 Nov 2010; Laurento Frittella (mrfree) <laurento.frittella@gmail.com>
   -files/1.2.8-lang.patch, rbutil-1.2.8.ebuild:
   Fixed translations issue
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 1fb91e32e..f72df3a56 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1,4 +1,5 @@
+AUX 1.2.8-fix-parallel-make.patch 2313 RMD160 77d884f9b90ae0253a9f7d743934c465d387b156 SHA1 4e77b1f367b0215339a2bd9244e232520af0c8e9 SHA256 0ced1e0eb3e887e96c57cd079be7bc76d619ca210b0912e9cf795cb4f120ec5b
 DIST rbutil_1.2.8-src.tar.bz2 760757 RMD160 447f3428d09700c3073b33f941ad4fc2a34eb02d SHA1 5e5ba05555b095c23be81443f436582f15aa59cd SHA256 fa35a886340291e30b14e9f618c4a4c9b2296d832ce0cd1b86cdfdcdb3a75cbe
-EBUILD rbutil-1.2.8.ebuild 957 RMD160 a454ade69a437b34da995928225112bdb2c79d92 SHA1 8501d5ad8c5ac6c303ca932a93c1f9fc7de67726 SHA256 e2e4060de9d92cfaff3408a982b49f3a7b5e0aca7c5bf7a6542cd0aed4811201
-MISC ChangeLog 1021 RMD160 75e57afe1008c1af14c9c037399792106be3f960 SHA1 f79014faba7bb9b585386560a23b389ea3b4c046 SHA256 0d13e1a20549e4312774575995c40aacae68a5c575d770d3d68be93cbd4f4d31
+EBUILD rbutil-1.2.8.ebuild 1028 RMD160 24ada748416e19b44bbbcf295d763cf98ff57646 SHA1 a1ad59610c897e54eb12d1a3f1a90ae54b6c1ea0 SHA256 9f28a1be532c5fef3ec0e27f3e4669c4d35056dc3d95e514f9fdb3dbe0664a32
+MISC ChangeLog 1225 RMD160 6bc09963ef73fbb360ea171874832a1738610bee SHA1 3d54aedeeaae89c41f15184c5e5ff442db43692f SHA256 fa2c1fad6e116c14743761925b2987dd828033343d487fc7642baa5f731e623d
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/app-misc/rbutil/files/1.2.8-fix-parallel-make.patch b/app-misc/rbutil/files/1.2.8-fix-parallel-make.patch
new file mode 100644
index 000000000..c1b2aa60d
--- /dev/null
+++ b/app-misc/rbutil/files/1.2.8-fix-parallel-make.patch
@@ -0,0 +1,50 @@
+--- rbutilqt.pro.orig	2011-01-05 10:42:19.299331569 +0100
++++ rbutilqt.pro	2011-01-05 10:44:24.933347928 +0100
+@@ -45,6 +45,12 @@
+ 
+ message("Rockbox Base dir: "$$RBBASE_DIR)
+ 
++unix {
++	# Some of the tool's Makefiles do not create their build dir with "mkdir -p", so do it here:
++	LIST = rbspeex ucl mkamsboot mktccboot mkmpioboot
++	for(dir, LIST):!exists($$MYBUILDDIR/$$dir):system(mkdir -p $$MYBUILDDIR/$$dir)
++}
++
+ # custom rules for rockbox-specific libs
+ !mac {
+     RBLIBPOSTFIX = .a
+@@ -67,20 +67,20 @@
+ }
+ 
+ rbspeex.commands = @$(MAKE) \
+-        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \
++        TARGET_DIR=$$MYBUILDDIR/rbspeex/ -C $$RBBASE_DIR/tools/rbspeex \
+         librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" \
+         SYS_SPEEX=\"$$LIBSPEEX\"
+ libucl.commands = @$(MAKE) \
+-        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \
++        TARGET_DIR=$$MYBUILDDIR/ucl/ -C $$RBBASE_DIR/tools/ucl/src \
+         libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
+ libmkamsboot.commands = @$(MAKE) \
+-        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \
++        TARGET_DIR=$$MYBUILDDIR/mkamsboot/ -C $$RBBASE_DIR/rbutil/mkamsboot \
+         libmkamsboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
+ libmktccboot.commands = @$(MAKE) \
+-        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot \
++        TARGET_DIR=$$MYBUILDDIR/mktccboot/ -C $$RBBASE_DIR/rbutil/mktccboot \
+         libmktccboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
+ libmkmpioboot.commands = @$(MAKE) \
+-        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkmpioboot \
++        TARGET_DIR=$$MYBUILDDIR/mkmpioboot/ -C $$RBBASE_DIR/rbutil/mkmpioboot \
+         libmkmpioboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
+ QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot
+ PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot libmkmpioboot
+@@ -105,7 +105,7 @@
+ 
+ DEPENDPATH = $$INCLUDEPATH
+ 
+-LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lmktccboot -lmkmpioboot -lucl
++LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -L$$MYBUILDDIR/rbspeex/ -lrbspeex -L$$MYBUILDDIR/mkamsboot/ -lmkamsboot -L$$MYBUILDDIR/mktccboot/ -lmktccboot -L$$MYBUILDDIR/mkmpioboot/ -lmkmpioboot -L$$MYBUILDDIR/ucl/ -lucl
+ 
+ # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
+ !static:!isEmpty(LIBSPEEX) {
diff --git a/app-misc/rbutil/rbutil-1.2.8.ebuild b/app-misc/rbutil/rbutil-1.2.8.ebuild
index ce269df0a..6105dac7a 100644
--- a/app-misc/rbutil/rbutil-1.2.8.ebuild
+++ b/app-misc/rbutil/rbutil-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}/${PN}/${PN}qt
 
+src_prepare() {
+	epatch "${FILESDIR}/${PV}"-fix-parallel-make.patch
+}
+
 src_configure() {
 	# generate binary translations
 	lrelease ${PN}qt.pro || die