summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergiy Kibrik <sakib@meta.ua>2015-09-17 13:08:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-30 12:03:13 (GMT)
commitb3269fc2e67e17a426564166f6c956086ad0f0f0 (patch)
tree00045b8dd3956bc8163b56a9b2dc76b9af8cd2cf
parent0facda51cea8bdf32515dfd6a7fd50b4ed3b0de0 (diff)
downloadpoky-b3269fc2e67e17a426564166f6c956086ad0f0f0.tar.gz
rsync: backport libattr checking patch
Add check_libattr.patch to version 3.1.0 recipe, which checks and includes libattr to linker, otherwise rsync may fail to build with linker error below (as -lattr option gets omitted): [..] lib/sysxattrs.o: undefined reference to symbol 'llistxattr@@ATTR_1.0' [..]/lib/libattr.so.1: error adding symbols: DSO missing from command line (From OE-Core rev: 576f63c50badd54b47cdda42a6466bb18984958d) Signed-off-by: Sergiy Kibrik <sakib@meta.ua> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rsync/files/check_libattr.patch33
-rw-r--r--meta/recipes-devtools/rsync/rsync_3.1.0.bb3
2 files changed, 35 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rsync/files/check_libattr.patch b/meta/recipes-devtools/rsync/files/check_libattr.patch
new file mode 100644
index 0000000..cb159fa
--- /dev/null
+++ b/meta/recipes-devtools/rsync/files/check_libattr.patch
@@ -0,0 +1,33 @@
1From 677c6e14cc7d5f41371d5616865a5f0cfc0a273f Mon Sep 17 00:00:00 2001
2From: Wayne Davison <wayned@samba.org>
3Date: Mon, 5 May 2014 09:25:13 -0700
4Subject: [PATCH] Check for attr lib.
5
6---
7 configure.ac | 3 ++-
8 1 file changed, 2 insertions(+), 1 deletion(-)
9
10diff --git a/configure.ac b/configure.ac
11index c7b28c5..8e3703c 100644
12--- a/configure.ac
13+++ b/configure.ac
14@@ -1007,7 +1007,7 @@ else
15 *)
16 AC_MSG_RESULT(running tests:)
17 AC_CHECK_LIB(acl,acl_get_file)
18- AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
19+ AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
20 AC_TRY_LINK([#include <sys/types.h>
21 #include <sys/acl.h>],
22 [ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
23@@ -1057,6 +1057,7 @@ else
24 AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])
25 AC_DEFINE(SUPPORT_XATTRS, 1)
26 AC_DEFINE(NO_SYMLINK_USER_XATTRS, 1, [True if symlinks do not support user xattrs])
27+ AC_CHECK_LIB(attr,getxattr)
28 ;;
29 darwin*)
30 AC_MSG_RESULT(Using OS X xattrs)
31--
321.9.1
33
diff --git a/meta/recipes-devtools/rsync/rsync_3.1.0.bb b/meta/recipes-devtools/rsync/rsync_3.1.0.bb
index a4a5c10..d253fe9 100644
--- a/meta/recipes-devtools/rsync/rsync_3.1.0.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.1.0.bb
@@ -1,7 +1,8 @@
1require rsync.inc 1require rsync.inc
2 2
3 3
4SRC_URI += "file://acinclude.m4" 4SRC_URI += "file://acinclude.m4 \
5 file://check_libattr.patch"
5 6
6SRC_URI[md5sum] = "3be148772a33224771a8d4d2a028b132" 7SRC_URI[md5sum] = "3be148772a33224771a8d4d2a028b132"
7SRC_URI[sha256sum] = "81ca23f77fc9b957eb9845a6024f41af0ff0c619b7f38576887c63fa38e2394e" 8SRC_URI[sha256sum] = "81ca23f77fc9b957eb9845a6024f41af0ff0c619b7f38576887c63fa38e2394e"