aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorJack Mitchell <jack.mitchell@dbbroadcast.co.uk>2012-09-05 15:21:32 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-09-06 13:14:38 +0200
commit8d87ca7f803d053e2cdc1f6322581e7852af01fa (patch)
treeada239db8581a6dfe8d86c8b78ceb9f81390de87 /meta-oe
parentf46e3e67642352df35bda9be74f13a7e3d6cfbfe (diff)
downloadmeta-openembedded-contrib-8d87ca7f803d053e2cdc1f6322581e7852af01fa.tar.gz
libplist: add upstream patch to fix parallel make issue
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch21
-rw-r--r--meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb5
2 files changed, 25 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch b/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch
new file mode 100644
index 0000000000..f6ef6f4f8b
--- /dev/null
+++ b/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch
@@ -0,0 +1,21 @@
+From 335b25febd4c864ad0ac08479f5cd43fc21b7d73 Mon Sep 17 00:00:00 2001
+From: Nikias Bassen
+Date: Mon, 09 Jul 2012 21:17:15 +0000
+Subject: Fix building with parallel build makeopts
+
+---
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0bad840..155994e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,6 +57,8 @@ ADD_SUBDIRECTORY( plutil )
+ ADD_SUBDIRECTORY( include )
+ ADD_SUBDIRECTORY( test )
+
++ADD_DEPENDENCIES( plist libcnary )
++
+ IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
+ ADD_SUBDIRECTORY( swig )
+ ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
+--
+cgit v0.9.0.2
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb
index 9c218fbebc..2da8058f00 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb
@@ -8,7 +8,10 @@ DEPENDS = "libxml2 glib-2.0 swig python"
inherit cmake pkgconfig
-SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2"
+SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \
+ file://fix-parallel-make.patch \
+"
+
SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6"
SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec"