From 475714e7a5bd35046247a27f5eee4537dbe698e2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 21 Dec 2010 22:09:53 +0000 Subject: samba: use external talloc instead of building own * libtalloc now conflicts with libtalloc from talloc recipe * tested only with samba-3.2.15 Acked-by: Koen Kooi Signed-off-by: Martin Jansa --- recipes/samba/samba.inc | 3 ++- recipes/samba/samba_3.2.15.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/samba/samba.inc b/recipes/samba/samba.inc index a95106dc20..e5fa06ef63 100644 --- a/recipes/samba/samba.inc +++ b/recipes/samba/samba.inc @@ -1,6 +1,6 @@ SECTION = "console/network" LICENSE = "GPL" -DEPENDS = "readline virtual/libiconv" +DEPENDS = "readline virtual/libiconv talloc" SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ @@ -37,6 +37,7 @@ EXTRA_OECONF='--disable-cups \ --with-mandir=${mandir} \ --with-swatdir=${datadir}/swat \ --with-aio-support \ + --without-libtalloc \ samba_cv_struct_timespec=yes \ libreplace_cv_HAVE_MMAP=${SAMBAMMAP}' diff --git a/recipes/samba/samba_3.2.15.bb b/recipes/samba/samba_3.2.15.bb index 3f535b6018..ef2707ef46 100644 --- a/recipes/samba/samba_3.2.15.bb +++ b/recipes/samba/samba_3.2.15.bb @@ -9,7 +9,7 @@ SRC_URI += "file://configure-3.2.8.patch \ SRC_URI[md5sum] = "5a3bcc4927c9643b9f42970d0815b18f" SRC_URI[sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46" -PR = "r2" +PR = "r3" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ -- cgit 1.2.3-korg