[meta-mono] [PATCH 0/4] mono-xsp: upgrade and fix build

[meta-mono] [PATCH 0/4] mono-xsp: upgrade and fix build

[Richard Tollerton]

I ran into some fairly bad build issues when trying to build mono-xsp that
appear to be worked around by using mono-xsp's autogen.sh instead of letting
autotools.bbclass attempt to call everything itself.

I then took the opportunity to upgrade the package to 3.0.

I haven't actually tested these changes -- I was under the mistaken impression
that monotools-server was necessary for remote debugging to work with mono4, and
figured that I might as well not let these changes go to waste, even though I
will probably not use them.

The following changes since commit 8c613bf3d82dd5edb58472e5b016d86a1a9e4a63:

  README: Add contributors section (2015-07-16 10:17:06 +0100)

are available in the git repository at:

  git://github.com/rtollert/meta-mono dev/rtollert/v3/mono-xsp
  https://github.com/rtollert/meta-mono/tree/dev/rtollert/v3/mono-xsp

Richard Tollerton (4):
  mono-xsp-3.x.inc: copy from mono-xsp.inc
  mono-xsp-3.x.inc: updating SRC_URI and LIC_FILES_CHKSUM
  mono-xsp_3.0.11.bb: add
  mono-xsp-3.x.inc: use autogen.sh

 recipes-mono/mono-xsp/mono-xsp-3.x.inc   | 44 ++++++++++++++++++++++++++++++++
 recipes-mono/mono-xsp/mono-xsp_3.0.11.bb |  5 ++++
 2 files changed, 49 insertions(+)
 create mode 100644 recipes-mono/mono-xsp/mono-xsp-3.x.inc
 create mode 100644 recipes-mono/mono-xsp/mono-xsp_3.0.11.bb

-- 
2.4.4

[meta-mono] [PATCH 1/4] mono-xsp-3.x.inc: copy from mono-xsp.inc

[Richard Tollerton]

Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
---
 recipes-mono/mono-xsp/mono-xsp-3.x.inc | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 recipes-mono/mono-xsp/mono-xsp-3.x.inc

diff --git a/recipes-mono/mono-xsp/mono-xsp-3.x.inc b/recipes-mono/mono-xsp/mono-xsp-3.x.inc
new file mode 100644
index 0000000..add1199
--- /dev/null
+++ b/recipes-mono/mono-xsp/mono-xsp-3.x.inc
@@ -0,0 +1,33 @@
+DESCRIPTION = "Standalone web server written in C# that can be used to run ASP.NET applications"
+SECTION = "devel/mono"
+DEPENDS = "mono"
+RDEPENDS_${PN} = "mono"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=84b17f6d63c3c28399d0f3786831d40c"
+
+inherit autotools-brokensep
+
+SRC_URI = "http://download.mono-project.com/sources/xsp/xsp-${PV}.tar.bz2"
+
+S = "${WORKDIR}/xsp-${PV}"
+
+PACKAGES += "${PN}-test \
+	${PN}-unittest \
+"
+
+FILES_${PN}-test = "${libdir}/xsp/test/*"
+
+FILES_${PN}-unittest = "${libdir}/xsp/unittests/*"
+
+FILES_${PN}-doc += "${libdir}/monodoc/*"
+
+# AJL - For now we are going to parcel up the different XSP hosting (mod_mono, fastcgi, xsp) together. More granular packages in future
+FILES_${PN} = "${bindir}/* \
+	${libdir}/mono/* \
+	${libdir}/xsp/2.0/* \
+	${libdir}/xsp/4.0/* \
+"
+
+# We seem to run into problems with make parallelisation building mono-xsp, so disable it for now
+PARALLEL_MAKE = ""
+
-- 
2.4.4

[meta-mono] [PATCH 2/4] mono-xsp-3.x.inc: updating SRC_URI and LIC_FILES_CHKSUM

[Richard Tollerton]

Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
---
 recipes-mono/mono-xsp/mono-xsp-3.x.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-mono/mono-xsp/mono-xsp-3.x.inc b/recipes-mono/mono-xsp/mono-xsp-3.x.inc
index add1199..ffe0a28 100644
--- a/recipes-mono/mono-xsp/mono-xsp-3.x.inc
+++ b/recipes-mono/mono-xsp/mono-xsp-3.x.inc
@@ -3,11 +3,11 @@ SECTION = "devel/mono"
 DEPENDS = "mono"
 RDEPENDS_${PN} = "mono"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=84b17f6d63c3c28399d0f3786831d40c"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9e1603e27acd337015fdfa7f7ff936c7"
 
 inherit autotools-brokensep
 
-SRC_URI = "http://download.mono-project.com/sources/xsp/xsp-${PV}.tar.bz2"
+SRC_URI = "https://github.com/mono/xsp/archive/${PV}.tar.gz"
 
 S = "${WORKDIR}/xsp-${PV}"
 
-- 
2.4.4

[meta-mono] [PATCH 3/4] mono-xsp_3.0.11.bb: add

[Richard Tollerton]

Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
---
 recipes-mono/mono-xsp/mono-xsp_3.0.11.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 recipes-mono/mono-xsp/mono-xsp_3.0.11.bb

diff --git a/recipes-mono/mono-xsp/mono-xsp_3.0.11.bb b/recipes-mono/mono-xsp/mono-xsp_3.0.11.bb
new file mode 100644
index 0000000..196ca32
--- /dev/null
+++ b/recipes-mono/mono-xsp/mono-xsp_3.0.11.bb
@@ -0,0 +1,5 @@
+require mono-xsp-3.x.inc
+
+SRC_URI[md5sum] = "6a694d5e87ebe57e532ec80a16b6966d"
+SRC_URI[sha256sum] = "290e302a03396c5cff7eb53dae008e9f79dd00aca15ad1e62865907220483baa"
+
-- 
2.4.4

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

[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 <rich.tollerton@ni.com>
---
 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

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

[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 <rich.tollerton@ni.com>
> ---
>  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

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

[Richard Tollerton]

Alex J Lennon <ajlennon@dynamicdevices.co.uk> 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.