Patchwork [PATCHv2,2/2] subversion: explicitly disable sasl

login
register
mail settings
Submitter Martin Jansa
Date July 6, 2013, 8:39 a.m.
Message ID <1373099962-19854-2-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/53201/
State Accepted, archived
Headers show

Comments

Martin Jansa - July 6, 2013, 8:39 a.m.
* cyrus-sasl is in meta-networking and isn't in subversion DEPENDS

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-devtools/subversion/subversion_1.6.15.bb | 1 +
 meta/recipes-devtools/subversion/subversion_1.7.10.bb | 1 +
 2 files changed, 2 insertions(+)
Jonathan Liu - July 8, 2013, 2:06 p.m.
On 6/07/2013 6:39 PM, Martin Jansa wrote:
> * cyrus-sasl is in meta-networking and isn't in subversion DEPENDS
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>   meta/recipes-devtools/subversion/subversion_1.6.15.bb | 1 +
>   meta/recipes-devtools/subversion/subversion_1.7.10.bb | 1 +
>   2 files changed, 2 insertions(+)
>
> diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
> index 244d7ea..2a072e8 100644
> --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
> +++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
> @@ -24,6 +24,7 @@ EXTRA_OECONF = " \
>                   --without-berkeley-db --without-apxs --without-apache \
>                   --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
>                   --with-apr-util=${STAGING_BINDIR_CROSS} \
> +                --without-sasl \
>                   ac_cv_path_RUBY=none"
>   
>   inherit autotools
> diff --git a/meta/recipes-devtools/subversion/subversion_1.7.10.bb b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
> index 9d189fe..ded1788 100644
> --- a/meta/recipes-devtools/subversion/subversion_1.7.10.bb
> +++ b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
> @@ -22,6 +22,7 @@ EXTRA_OECONF = " \
>                   --without-berkeley-db --without-apxs \
>                   --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
>                   --with-apr-util=${STAGING_BINDIR_CROSS} \
> +                --without-sasl \
>                   ac_cv_path_RUBY=none"
>   
>   inherit autotools
I would prefer a PACKAGECONFIG for this as I depend on subversion with 
SASL support.

Regards,
Jonathan
Martin Jansa - July 8, 2013, 3:01 p.m.
On Sat, Jul 06, 2013 at 10:39:22AM +0200, Martin Jansa wrote:
> * cyrus-sasl is in meta-networking and isn't in subversion DEPENDS
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-devtools/subversion/subversion_1.6.15.bb | 1 +
>  meta/recipes-devtools/subversion/subversion_1.7.10.bb | 1 +
>  2 files changed, 2 insertions(+)

I'll change this into PACKAGECONFIG, Jonathan Liu reported that he needs
subversion with sasl support.

> 
> diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
> index 244d7ea..2a072e8 100644
> --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
> +++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
> @@ -24,6 +24,7 @@ EXTRA_OECONF = " \
>                  --without-berkeley-db --without-apxs --without-apache \
>                  --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
>                  --with-apr-util=${STAGING_BINDIR_CROSS} \
> +                --without-sasl \
>                  ac_cv_path_RUBY=none"
>  
>  inherit autotools
> diff --git a/meta/recipes-devtools/subversion/subversion_1.7.10.bb b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
> index 9d189fe..ded1788 100644
> --- a/meta/recipes-devtools/subversion/subversion_1.7.10.bb
> +++ b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
> @@ -22,6 +22,7 @@ EXTRA_OECONF = " \
>                  --without-berkeley-db --without-apxs \
>                  --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
>                  --with-apr-util=${STAGING_BINDIR_CROSS} \
> +                --without-sasl \
>                  ac_cv_path_RUBY=none"
>  
>  inherit autotools
> -- 
> 1.8.2.1
>

Patch

diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
index 244d7ea..2a072e8 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
@@ -24,6 +24,7 @@  EXTRA_OECONF = " \
                 --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS} \
+                --without-sasl \
                 ac_cv_path_RUBY=none"
 
 inherit autotools
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.10.bb b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
index 9d189fe..ded1788 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.10.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
@@ -22,6 +22,7 @@  EXTRA_OECONF = " \
                 --without-berkeley-db --without-apxs \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS} \
+                --without-sasl \
                 ac_cv_path_RUBY=none"
 
 inherit autotools