From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../files/0001-Fix-warnings-found-with-clang.patch | 51 ++++++++++++++++++++++ .../libimobiledevice/files/fix-parallel-make.patch | 21 +++++++++ .../libimobiledevice/libplist_1.8.bb | 31 +++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb (limited to 'meta-openembedded/meta-oe/recipes-extended/libimobiledevice') diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch new file mode 100644 index 000000000..f8114a063 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch @@ -0,0 +1,51 @@ +From ad1be542b87b3186f8ef7bee2c594daefe5bb4c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 18 Oct 2016 21:31:40 +0000 +Subject: [PATCH] Fix warnings found with clang + +| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:107:12: error: non-void function 'base64decode' should return a value [-Wreturn-type] +| if (!buf) return; +| ^ +| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:109:16: error: non-void function 'base64decode' should return a value [-Wreturn-type] +| if (len <= 0) return; + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + libcnary/node.c | 2 +- + src/base64.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libcnary/node.c b/libcnary/node.c +index 1f9f669..d6f3f63 100644 +--- a/libcnary/node.c ++++ b/libcnary/node.c +@@ -104,7 +104,7 @@ int node_detach(node_t* parent, node_t* child) { + + int node_insert(node_t* parent, unsigned int index, node_t* child) + { +- if (!parent || !child) return; ++ if (!parent || !child) return -1; + child->isLeaf = TRUE; + child->isRoot = FALSE; + child->parent = parent; +diff --git a/src/base64.c b/src/base64.c +index 65c6061..531a06a 100644 +--- a/src/base64.c ++++ b/src/base64.c +@@ -104,9 +104,9 @@ static int base64decode_block(unsigned char *target, const char *data, size_t da + + unsigned char *base64decode(const char *buf, size_t *size) + { +- if (!buf) return; ++ if (!buf) return 0; + size_t len = strlen(buf); +- if (len <= 0) return; ++ if (len <= 0) return 0; + unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3); + + unsigned char *line; +-- +1.9.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch new file mode 100644 index 000000000..f6ef6f4f8 --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb new file mode 100644 index 000000000..f78979619 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb @@ -0,0 +1,31 @@ +SUMMARY = "A library to handle Apple Property List format whereas it's binary or XML" + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ + file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7" + +DEPENDS = "libxml2 glib-2.0 swig python" + +inherit cmake pkgconfig + +SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \ + file://fix-parallel-make.patch \ + file://0001-Fix-warnings-found-with-clang.patch \ + " + +SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6" +SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec" + +do_install_append () { + if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then + chrpath -d ${D}${libdir}/python*/site-packages/plist/_plist.so + fi +} + +PACKAGES =+ "${PN}-utils ${PN}++ ${PN}-python" +FILES_${PN} = "${libdir}/libplist${SOLIBS}" +FILES_${PN}++ = "${libdir}/libplist++${SOLIBS}" +FILES_${PN}-utils = "${bindir}/*" +FILES_${PN}-python = "${libdir}/python*/site-packages/*" + + -- cgit v1.2.3