summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-04-25 20:29:47 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-04-25 20:29:47 +0000
commite6e374bc69dc9dfdc311e7b01d7c2c2b9add1a3e (patch)
tree591ee6bd537a3633f616d2ed470d53c3971df5d9 /dev-util
parentFix deprecation warnings. (diff)
downloadgentoo-2-e6e374bc69dc9dfdc311e7b01d7c2c2b9add1a3e.tar.gz
gentoo-2-e6e374bc69dc9dfdc311e7b01d7c2c2b9add1a3e.tar.bz2
gentoo-2-e6e374bc69dc9dfdc311e7b01d7c2c2b9add1a3e.zip
Fix parallel make issue, bug 353847
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/kdevelop-php/ChangeLog6
-rw-r--r--dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch12
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild4
3 files changed, 19 insertions, 3 deletions
diff --git a/dev-util/kdevelop-php/ChangeLog b/dev-util/kdevelop-php/ChangeLog
index 32c2021aff72..e4e32d7e19f3 100644
--- a/dev-util/kdevelop-php/ChangeLog
+++ b/dev-util/kdevelop-php/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/kdevelop-php
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/ChangeLog,v 1.23 2011/04/12 21:48:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/ChangeLog,v 1.24 2011/04/25 20:29:47 dilfridge Exp $
+
+ 25 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ kdevelop-php-1.2.0.ebuild, +files/kdevelop-php-1.2.0-parmake.patch:
+ Fix parallel make issue, bug 353847
12 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-kdevelop-php-1.1.2.ebuild, kdevelop-php-1.2.0.ebuild:
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
new file mode 100644
index 000000000000..4e64c9fad50f
--- /dev/null
+++ b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
@@ -0,0 +1,12 @@
+diff -ruN kdevelop-php-1.2.0.orig/parser/CMakeLists.txt kdevelop-php-1.2.0/parser/CMakeLists.txt
+--- kdevelop-php-1.2.0.orig/parser/CMakeLists.txt 2011-01-23 20:42:54.000000000 +0100
++++ kdevelop-php-1.2.0/parser/CMakeLists.txt 2011-04-25 22:29:05.486182541 +0200
+@@ -21,6 +21,8 @@
+ ${KDE4_KTEXTEDITOR_LIBS}
+ )
+
++add_dependencies( kdev4phpparser php-parser-generated )
++
+ kde4_add_executable( php-parser main.cpp )
+ target_link_libraries(php-parser ${QT_QTCORE_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} kdev4phpparser)
+
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild
index bda3491c2f1f..59094a56d282 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild,v 1.6 2011/04/12 21:48:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild,v 1.7 2011/04/25 20:29:47 dilfridge Exp $
EAPI=3
@@ -29,4 +29,4 @@ RDEPEND="
doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
"
-PATCHES=( "${FILESDIR}/${P}"-dbustests.patch )
+PATCHES=( "${FILESDIR}/${P}"-{dbustests,parmake}.patch )