| Submitter | ml@communistcode.co.uk |
|---|---|
| Date | Sept. 5, 2012, 3:21 p.m. |
| Message ID | <1346858494-4849-1-git-send-email-ml@communistcode.co.uk> |
| Download | mbox | patch |
| Permalink | /patch/35965/ |
| State | Superseded |
| Headers | show |
Comments
On 05/09/12 16:21, ml@communistcode.co.uk wrote: > From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> > > Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> > --- > .../libimobiledevice/files/fix-parallel-make.patch | 21 +++++++++++++++++++++ > .../libimobiledevice/libplist_1.8.bb | 5 ++++- > 2 files changed, 25 insertions(+), 1 deletion(-) > create mode 100644 meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch > > 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 0000000..f6ef6f4 > --- /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 9c218fb..2da8058 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" > With all the chatter this has got a bit lost. I believe everyone is now happy so this patch set is ready to merge. Cheers all,
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 06-09-12 10:52, Jack Mitchell schreef: > On 05/09/12 16:21, ml@communistcode.co.uk wrote: >> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> >> >> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> --- >> .../libimobiledevice/files/fix-parallel-make.patch | 21 >> +++++++++++++++++++++ .../libimobiledevice/libplist_1.8.bb >> | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode >> 100644 >> meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch >> >> >> 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 0000000..f6ef6f4 --- /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 >> 9c218fb..2da8058 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" >> > > With all the chatter this has got a bit lost. I believe everyone is now > happy so this patch set is ready to merge. I'll take a look at merging these (and the imobiledevice ones) later today. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFQSIDoMkyGM64RGpERAuc3AJ0ZHjqckjDHQv5NXjpCadb6NmJgTgCfVmjP tL/6M3kCecfg1fCdqNtKu88= =/z2q -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 05-09-12 17:21, ml@communistcode.co.uk schreef:
> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
You're missing the '[meta-oe]' tag as specified in the README for that
layer, which means it doesn't show up in
http://patchwork.openembedded.org/project/oe/list/?q=meta-oe
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQSIZDMkyGM64RGpERAkqAAKCNWtIrjN81A1VUe7eZKGjtWYI+OACePOHH
xNHnsO0mXT0D5fkrX8x2KkQ=
=2+ex
-----END PGP SIGNATURE-----
Patch
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 0000000..f6ef6f4 --- /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 9c218fb..2da8058 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"