summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2020-07-27 21:27:18 +0200
committerKhem Raj <raj.khem@gmail.com>2020-07-28 12:55:35 -0700
commit24b480cc1f253f53000e4d2a43c843204329f7dd (patch)
treef21f7ba8dcb41c1a1a814f5244a07307b535af96
parent3671e60c3937f3ca2072df7223a0d7607f883cda (diff)
downloadmeta-openembedded-24b480cc1f253f53000e4d2a43c843204329f7dd.tar.gz
libimobiledevice: update to 1.3.0
Patch was removed as the issue it was fixing was solved in this version of the library. Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch38
-rw-r--r--meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb (renamed from meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb)11
2 files changed, 3 insertions, 46 deletions
diff --git a/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch b/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch
deleted file mode 100644
index 679a8b597a..0000000000
--- a/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Fix configure error in large file checks on 64-bit architectures
2
3 configure:17888: checking for native large file support
4 configure:17891: error: in `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/libimobiledevice/1.1.4-r0/libimobiledevice-1.1.4':
5 configure:17893: error: cannot run test program while cross compiling
6
7configure.ac was using AC_SYS_LARGEFILE macro as is typical, but then
8there was an extra runtime check added beyond that:
9check if off_t is 8 bytes (64 bits) long.
10If that runtime check passed, _FILE_OFFSET_BITS was defined as 64.
11
12Runtime checks need to go away for cross compiling, and luckily this extra
13check was not serving any useful purpose. Note that off_t was *already*
1464 bits, *without* setting _FILE_OFFSET_BITS, which makes _FILE_OFFSET_BITS
15unneeded for large file support.
16
17If AC_SYS_LARGEFILE macro sets ac_cv_sys_file_offset_bits=no,
18just leave _FILE_OFFSET_BITS undefined!
19
20--- libimobiledevice-1.1.4/configure.ac.old 2015-07-15 01:38:50.900143927 -0700
21+++ libimobiledevice-1.1.4/configure.ac 2015-07-15 01:39:13.300144430 -0700
22@@ -174,16 +174,6 @@
23 if test "$enable_largefile" != no; then
24 if test "$ac_cv_sys_file_offset_bits" != 'no'; then
25 LFS_CFLAGS="$LFS_CFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
26- else
27- AC_MSG_CHECKING(for native large file support)
28- AC_RUN_IFELSE([AC_LANG_SOURCE([#include <unistd.h>
29- int main (int argc, char **argv)
30- {
31- exit(!(sizeof(off_t) == 8));
32- }])],
33- [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
34- AC_MSG_RESULT(yes)],
35- [AC_MSG_RESULT(no)])
36 fi
37 if test "$ac_cv_sys_large_files" != 'no'; then
38 LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES=1"
diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb
index 908b98d8c5..bcedd6297e 100644
--- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
+++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb
@@ -4,17 +4,12 @@ LIC_FILES_CHKSUM = "\
4 file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ 4 file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \
5 file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \ 5 file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \
6" 6"
7 7HOMEPAGE = "http://www.libimobiledevice.org/"
8HOMEPAGE ="http://www.libimobiledevice.org/"
9 8
10DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt" 9DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt"
11 10
12SRCREV = "fb71aeef10488ed7b0e60a1c8a553193301428c0" 11SRCREV = "15f8652126664e3a4b980e5d1c039b9053ce8566"
13PV = "1.2.0+git${SRCPV}" 12SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https"
14SRC_URI = "\
15 git://github.com/libimobiledevice/libimobiledevice;protocol=https \
16 file://configure-fix-largefile.patch \
17"
18 13
19S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
20inherit autotools pkgconfig 15inherit autotools pkgconfig