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

libmtp: Fix build with glibc 2.20

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2014-09-04 00:32:36 -07:00 committed by Martin Jansa
parent 3cf6953945
commit a67fd78dc0
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/glibc-2.20.patch Normal file
View File

@ -0,0 +1,36 @@
Include config.h so we get the defines available for subsequent
include files
Fixes errors like
| In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/beaglebone/usr/include/string.h:634:0,
| from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/cortexa8t2hf-vfp-neon-oe-linux-gnueabi/libmtp/1.1.5-r0/libmtp-1.1.5/src/util.c:36:
| /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/cortexa8t2hf-vfp-neon-oe-linux-gnueabi/libmtp/1.1.5-r0/libmtp-1.1.5/src/util.h:29:7: error: expected identifier or '(' before '__extension
__'
| char *strndup (const char *s, size_t n);
| ^
| /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/cortexa8t2hf-vfp-neon-oe-linux-gnueabi/libmtp/1.1.5-r0/libmtp-1.1.5/src/util.c:111:7: error: expected identifier or '(' before '__extensio
n__'
| char *strndup (const char *s, size_t n)
| ^
| make[2]: *** [libmtp_la-util.lo] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: libmtp-1.1.5/src/util.c
===================================================================
--- libmtp-1.1.5.orig/src/util.c 2011-01-10 05:37:21.000000000 -0800
+++ libmtp-1.1.5/src/util.c 2014-09-03 23:50:44.703563888 -0700
@@ -22,6 +22,8 @@
* Boston, MA 02111-1307, USA.
*/
+#include "config.h"
+
/* MSVC does not have these */
#ifndef _MSC_VER
#include <sys/time.h>

1
meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
View File

@ -19,6 +19,7 @@ SCM_URI = "git://git.code.sf.net/p/libmtp/code"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
file://69-libmtp.rules \
file://glibc-2.20.patch \
"
SRC_URI[md5sum] = "f80e45c0e6e5798c434bb1c26a7b602d"
SRC_URI[sha256sum] = "787679171baf8b3cf2fcc03196c705ab4d7cbc969bd71f9d3696be1ce7f1c63a"