Re: [PATCH 2/2] samba: use external talloc instead of building own

[Koen Kooi <k.kooi@student.utwente.nl>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Acked-by: Koen Kooi <koen@openembedded.org>

On 21-12-10 15:09, Martin Jansa wrote:
> * libtalloc now conflicts with libtalloc from talloc recipe
> * tested only with samba-3.2.15
> ---
>  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 a95106d..e5fa06e 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 3f535b6..ef2707e 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 \

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNENUhMkyGM64RGpERAlOOAJ9y27X2rICdmXw/uija6QDTyFEzyQCeMcac
wsIjyIKY6gnmpIbwvh9qjrw=
=8Xom
-----END PGP SIGNATURE-----