Re: [yocto] [meta-mono] [PATCH 4/4] mono-xsp-3.x.inc: use autogen.sh

2015-07-16 Thread Richard Tollerton 
Alex J Lennon  writes:

> Many thanks for the updates, fixes, and cleanups Richard. Your
> patch-sets for mono-xsp, fsharp, mono-basic are applied.
>
> In future can you remove any trailing newlines from your patches
> please?

You're welcome! Yes, I will get those removed in future pull requests.
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-mono] [PATCH 4/4] mono-xsp-3.x.inc: use autogen.sh

2015-07-16 Thread Alex J Lennon 


On 16/07/2015 18:22, Richard Tollerton wrote:
> The following build failure was observed:
>
> | Makefile.am:7: error: BUILD_DOCS does not appear in AM_CONDITIONAL
>
> This occurs because aclocal must be called with "-I build/m4/shamrock -I
> build/m4/shave", as is done in autogen.sh.
>
> I tried adding those includes to EXTRA_AUTORECONF or acpaths. That seems
> to only partially solve the problem, as MONO_MODULE remains undefined
> and unsubstituted in configure, leading to:
>
> | xsp-3.0.11/configure: line 2651: syntax error near unexpected token 
> `MONO_MODULE,'
>
> This might have something to do with the `automake --gnu` option in
> autogen.sh. I don't know for certain
>
> In any case, merely calling autogen.sh does work. This patch implements
> that, using autotools.bbclass:oe_runconf() as a template.
>
> Signed-off-by: Richard Tollerton 
> ---
>  recipes-mono/mono-xsp/mono-xsp-3.x.inc | 11 +++
>  1 file changed, 11 insertions(+)
>
> diff --git a/recipes-mono/mono-xsp/mono-xsp-3.x.inc 
> b/recipes-mono/mono-xsp/mono-xsp-3.x.inc
> index ffe0a28..77af516 100644
> --- a/recipes-mono/mono-xsp/mono-xsp-3.x.inc
> +++ b/recipes-mono/mono-xsp/mono-xsp-3.x.inc
> @@ -9,6 +9,17 @@ inherit autotools-brokensep
>  
>  SRC_URI = "https://github.com/mono/xsp/archive/${PV}.tar.gz";
>  
> +do_configure () {
> +set +e
> +${CACHED_CONFIGUREVARS} ${S}/autogen.sh --verbose ${CONFIGUREOPTS} 
> ${EXTRA_OECONF}
> +if [ "$?" != "0" ]; then
> + echo "Configure failed. The contents of all config.log files follows to 
> aid debugging"
> + find ${S} -name config.log -print -exec cat {} \;
> + bbfatal "oe_runconf failed"
> +fi
> +set -e
> +}
> +
>  S = "${WORKDIR}/xsp-${PV}"
>  
>  PACKAGES += "${PN}-test \

Many thanks for the updates, fixes, and cleanups Richard. Your
patch-sets for mono-xsp, fsharp, mono-basic are applied.

In future can you remove any trailing newlines from your patches please?

Thanks, Alex

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [meta-mono] [PATCH 4/4] mono-xsp-3.x.inc: use autogen.sh

2015-07-16 Thread Richard Tollerton 
The following build failure was observed:

| Makefile.am:7: error: BUILD_DOCS does not appear in AM_CONDITIONAL

This occurs because aclocal must be called with "-I build/m4/shamrock -I
build/m4/shave", as is done in autogen.sh.

I tried adding those includes to EXTRA_AUTORECONF or acpaths. That seems
to only partially solve the problem, as MONO_MODULE remains undefined
and unsubstituted in configure, leading to:

| xsp-3.0.11/configure: line 2651: syntax error near unexpected token 
`MONO_MODULE,'

This might have something to do with the `automake --gnu` option in
autogen.sh. I don't know for certain

In any case, merely calling autogen.sh does work. This patch implements
that, using autotools.bbclass:oe_runconf() as a template.

Signed-off-by: Richard Tollerton 
---
 recipes-mono/mono-xsp/mono-xsp-3.x.inc | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/recipes-mono/mono-xsp/mono-xsp-3.x.inc 
b/recipes-mono/mono-xsp/mono-xsp-3.x.inc
index ffe0a28..77af516 100644
--- a/recipes-mono/mono-xsp/mono-xsp-3.x.inc
+++ b/recipes-mono/mono-xsp/mono-xsp-3.x.inc
@@ -9,6 +9,17 @@ inherit autotools-brokensep
 
 SRC_URI = "https://github.com/mono/xsp/archive/${PV}.tar.gz";
 
+do_configure () {
+set +e
+${CACHED_CONFIGUREVARS} ${S}/autogen.sh --verbose ${CONFIGUREOPTS} 
${EXTRA_OECONF}
+if [ "$?" != "0" ]; then
+   echo "Configure failed. The contents of all config.log files follows to 
aid debugging"
+   find ${S} -name config.log -print -exec cat {} \;
+   bbfatal "oe_runconf failed"
+fi
+set -e
+}
+
 S = "${WORKDIR}/xsp-${PV}"
 
 PACKAGES += "${PN}-test \
-- 
2.4.4

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto