diff options
author | Bian Naimeng <biannm@cn.fujitsu.com> | 2015-06-19 11:08:08 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-24 14:03:54 +0200 |
commit | 3659908852b0241ecdce0a53423d7118763c1485 (patch) | |
tree | 50a6833ec99b9bfc2ce1841f7c67e0bc1a8150db /meta-filesystems | |
parent | 4a89e4c6088a3c3c3af8a228b10ee1dea9353634 (diff) | |
download | meta-openembedded-3659908852b0241ecdce0a53423d7118763c1485.tar.gz |
smbnetfs: using PKG_CHECK_MODULES to found headers and libraries for smbclient
After samba was upgraded to 4.x, headers of smbclient were installed into include/samba-4.0/,
so we should using PKG_CHECK_MODULES to found headers and libraries for smbclient to avoid
error as below.
${WORKDIR}/git/src/samba.c
| smbnetfs/git-r0/git/src/smb_conn_srv.c:12:26: fatal error: libsmbclient.h: No such file or directory #include <libsmbclient.h>
| ^
| compilation terminated.
| make[2]: *** [smb_conn_srv.o] Error 1
| make[2]: *** Waiting for unfinished jobs....
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-filesystems')
2 files changed, 44 insertions, 1 deletions
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch new file mode 100644 index 000000000..f05f09f61 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 7a524d49b3d4459280f18942df2980603400ec52 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bian Naimeng <biannm@cn.fujitsu.com> | ||
3 | Date: Fri, 19 Jun 2015 11:54:44 +0900 | ||
4 | Subject: [PATCH] Using PKG_CHECK_MODULES to found headers and libraries of | ||
5 | smbclient | ||
6 | |||
7 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> | ||
8 | --- | ||
9 | configure.in | 5 +++++ | ||
10 | src/Makefile.am | 3 +++ | ||
11 | 2 files changed, 8 insertions(+) | ||
12 | |||
13 | diff --git a/configure.in b/configure.in | ||
14 | index ce21aef..ecd7119 100644 | ||
15 | --- a/configure.in | ||
16 | +++ b/configure.in | ||
17 | @@ -125,6 +125,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUserData, | ||
18 | )] | ||
19 | ) | ||
20 | |||
21 | +dnl ***************************************************************** | ||
22 | +dnl *** Check libsmbclient by pkgconfig to get cflags and ldflags *** | ||
23 | +dnl ***************************************************************** | ||
24 | +PKG_CHECK_MODULES(SMBCLIENT, smbclient) | ||
25 | + | ||
26 | dnl ****************** | ||
27 | dnl *** Final step *** | ||
28 | dnl ****************** | ||
29 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
30 | index 41519d8..9fc97e9 100644 | ||
31 | --- a/src/Makefile.am | ||
32 | +++ b/src/Makefile.am | ||
33 | @@ -16,3 +16,6 @@ smbnetfs_SOURCES = \ | ||
34 | event.c event.h \ | ||
35 | reconfigure.c reconfigure.h \ | ||
36 | main.c | ||
37 | + | ||
38 | +smbnetfs_CFLAGS=${SMBCLIENT_CFLAGS} | ||
39 | +smbnetfs_LDFLAGS=${SMBCLIENT_LDFLAGS} | ||
40 | -- | ||
41 | 1.8.4.2 | ||
42 | |||
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb index a0eddbc79..f1420fbed 100644 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb | |||
@@ -17,7 +17,8 @@ PKGV = "${GITPKGVTAG}" | |||
17 | SRCREV = "ace1c519d45fe488b9b7e6cc77a2bcadb6c83464" | 17 | SRCREV = "ace1c519d45fe488b9b7e6cc77a2bcadb6c83464" |
18 | 18 | ||
19 | SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ | 19 | SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ |
20 | file://configure.patch" | 20 | file://configure.patch \ |
21 | file://Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch" | ||
21 | 22 | ||
22 | PACKAGECONFIG ??= "" | 23 | PACKAGECONFIG ??= "" |
23 | PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,--with-gnome-keyring=no,libgnome-keyring" | 24 | PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,--with-gnome-keyring=no,libgnome-keyring" |