CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libimobiledevice: fix gcc 5 link failure

Browse Source 
Drop 'inline' from some functions that had 'inline' keyword without
a definition at that point (they were defined in a different file).

Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
S. Lockwood-Childs 2015-10-03 18:13:11 -07:00 committed by Martin Jansa
parent 23400e939e
commit af5393c66d
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch Normal file
View File

@ -0,0 +1,31 @@
Fix link error with gcc 5 toolchains
afc.c:258: error: undefined reference to 'debug_buffer'
collect2: error: ld returned 1 exit status
debug.h header was declaring things inline without providing a definition.
Files that included this header then failed to link against the corresponding
external symbol in debug.c, because the linker took the 'inline' keyword
seriously rather than ignoring it.
--- libimobiledevice-1.1.4/src/debug.h.orig 2015-10-03 16:24:08.758740386 -0700
+++ libimobiledevice-1.1.4/src/debug.h 2015-10-03 16:24:22.706740355 -0700
@@ -44,14 +44,14 @@
#define debug_plist(a)
#endif
-LIBIMOBILEDEVICE_INTERNAL inline void debug_info_real(const char *func,
+LIBIMOBILEDEVICE_INTERNAL void debug_info_real(const char *func,
const char *file,
int line,
const char *format, ...);
-LIBIMOBILEDEVICE_INTERNAL inline void debug_buffer(const char *data, const int length);
-LIBIMOBILEDEVICE_INTERNAL inline void debug_buffer_to_file(const char *file, const char *data, const int length);
-LIBIMOBILEDEVICE_INTERNAL inline void debug_plist_real(const char *func,
+LIBIMOBILEDEVICE_INTERNAL void debug_buffer(const char *data, const int length);
+LIBIMOBILEDEVICE_INTERNAL void debug_buffer_to_file(const char *file, const char *data, const int length);
+LIBIMOBILEDEVICE_INTERNAL void debug_plist_real(const char *func,
const char *file,
int line,
plist_t plist);

1
meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb
View File

@ -12,6 +12,7 @@ DEPENDS = "libplist usbmuxd libtasn1 gnutls libgcrypt"
SRC_URI = " \
http://www.libimobiledevice.org/downloads/libimobiledevice-${PV}.tar.bz2 \
file://configure-fix-largefile.patch \
file://inline-without-definition.patch \
"
SRC_URI[md5sum] = "3f28cbc6a2e30d34685049c0abde5183"