diff options
author | Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> | 2012-09-05 15:21:32 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-09-06 13:14:38 +0200 |
commit | 8d87ca7f803d053e2cdc1f6322581e7852af01fa (patch) | |
tree | ada239db8581a6dfe8d86c8b78ceb9f81390de87 | |
parent | f46e3e67642352df35bda9be74f13a7e3d6cfbfe (diff) | |
download | meta-openembedded-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>
-rw-r--r-- | meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch | 21 | ||||
-rw-r--r-- | meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb | 5 |
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 000000000..f6ef6f4f8 --- /dev/null +++ b/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From 335b25febd4c864ad0ac08479f5cd43fc21b7d73 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nikias Bassen | ||
3 | Date: Mon, 09 Jul 2012 21:17:15 +0000 | ||
4 | Subject: Fix building with parallel build makeopts | ||
5 | |||
6 | --- | ||
7 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
8 | index 0bad840..155994e 100644 | ||
9 | --- a/CMakeLists.txt | ||
10 | +++ b/CMakeLists.txt | ||
11 | @@ -57,6 +57,8 @@ ADD_SUBDIRECTORY( plutil ) | ||
12 | ADD_SUBDIRECTORY( include ) | ||
13 | ADD_SUBDIRECTORY( test ) | ||
14 | |||
15 | +ADD_DEPENDENCIES( plist libcnary ) | ||
16 | + | ||
17 | IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) | ||
18 | ADD_SUBDIRECTORY( swig ) | ||
19 | ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) | ||
20 | -- | ||
21 | 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 9c218fbeb..2da8058f0 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" | |||
8 | 8 | ||
9 | inherit cmake pkgconfig | 9 | inherit cmake pkgconfig |
10 | 10 | ||
11 | SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2" | 11 | SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \ |
12 | file://fix-parallel-make.patch \ | ||
13 | " | ||
14 | |||
12 | SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6" | 15 | SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6" |
13 | SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec" | 16 | SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec" |
14 | 17 | ||