mono: bump to version 4.0.1

PATCH New Angelo Compagnucci 3 participants 9 messages Apr 30, 2015 – May 4, 2015

lore

Share & tools

lore

Angelo Compagnucci

author

2015-04-30 14:03 UTC #0 lore raw

v2 cover mono: bump to version 4.0.1

This patch series bumps mono version to 4.0.1. It also removes no more needed patches accepted upstream.

Angelo Compagnucci (2):
package/monolite: bump to version 117
package/mono: bump to version 4.0.1

 .../0003-mono-context.h-fix-build-on-MIPS.patch    | 33 --------
 ...e-ppc-sigctx-monoctx-conversion-code-to-m.patch | 92 ----------------------
 ...build-errors-in-mono-context.c-on-ppc64el.patch | 84 --------------------
 package/mono/Config.in                             | 22 ------
 package/mono/mono.mk                               |  9 +--
 package/monolite/monolite.mk                       |  2 +-
 6 files changed, 2 insertions(+), 240 deletions(-)
 delete mode 100644 package/mono/0003-mono-context.h-fix-build-on-MIPS.patch
 delete mode 100644 package/mono/0004-jit-Move-the-ppc-sigctx-monoctx-conversion-code-to-m.patch
 delete mode 100644 package/mono/0005-Fix-build-errors-in-mono-context.c-on-ppc64el.patch

Signature · 1 line

1.9.1

Angelo Compagnucci

author

2015-04-30 14:03 UTC #1 lore raw

PATCH v2 1/2 package/monolite: bump to version 117

This bump is required for proper compiling mono 4.0.1.

Signed-off-by Angelo Compagnucci <[email protected]>

---
 package/monolite/monolite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/monolite/monolite.mk +1 -1

index b3c7553..aa6c28c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MONOLITE_VERSION = 111
+MONOLITE_VERSION = 117
 MONOLITE_SITE = http://storage.bos.xamarin.com/mono-dist-master/latest
 MONOLITE_SOURCE = monolite-$(MONOLITE_VERSION)-latest.tar.gz
 MONOLITE_LICENSE = LGPLv2 or commercial

Signature · 1 line

1.9.1

Thomas Petazzoni

Applied

2015-05-02 15:03 UTC #2 lore raw

PATCH v2 1/2 package/monolite: bump to version 117

Dear Angelo Compagnucci,

Quoted 6 lines · Angelo Compagnucci

This bump is required for proper compiling mono 4.0.1.
Signed-off-by Angelo Compagnucci <[email protected]>
---
 package/monolite/monolite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Angelo Compagnucci

author

2015-04-30 14:03 UTC #3 lore raw

PATCH v2 2/2 package/mono: bump to version 4.0.1

In reply to Angelo Compagnucci

This patch:

* bumps mono version to 4.0.1.
* Removes no more needed patches included upstream
* Removes profile switches no more present in configure

Signed-off-by Angelo Compagnucci <[email protected]>

---
 .../0003-mono-context.h-fix-build-on-MIPS.patch    | 33 --------
 ...e-ppc-sigctx-monoctx-conversion-code-to-m.patch | 92 ----------------------
 ...build-errors-in-mono-context.c-on-ppc64el.patch | 84 --------------------
 package/mono/Config.in                             | 22 ------
 package/mono/mono.mk                               |  9 +--
 5 files changed, 1 insertion(+), 239 deletions(-)
 delete mode 100644 package/mono/0003-mono-context.h-fix-build-on-MIPS.patch
 delete mode 100644 package/mono/0004-jit-Move-the-ppc-sigctx-monoctx-conversion-code-to-m.patch
 delete mode 100644 package/mono/0005-Fix-build-errors-in-mono-context.c-on-ppc64el.patch

package/mono/0003-mono-context.h-fix-build-on-MIPS.patch deleted +0 ~~-33~~

deleted file mode 100644
index f60cfb9..0000000
@@ -1,33 +0,0 @@
-From 2a8fab27a4308335282752164bebcfc77771fd3f Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Fri, 6 Feb 2015 14:56:10 +0100
-Subject: [PATCH] mono-context.h: fix build on MIPS
-
-The mono-context.h file uses definitions such as mips_fp and mips_sp,
-which are defined in <mono/arch/mips/mips-codegen.h>, but this file is
-not included, leading to build failures.
-
-This fix is similar to 4437ecea91bab3fe68ba1c30521acf75052662cd (for
-ARM).
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- mono/utils/mono-context.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/mono/utils/mono-context.h b/mono/utils/mono-context.h
-index 3b01b49..8852a63 100755
---- a/mono/utils/mono-context.h
-+++ b/mono/utils/mono-context.h
-@@ -460,6 +460,8 @@ mono_ia64_context_get_fp (MonoContext *ctx)
- 
- #elif ((defined(__mips__) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_MIPS))) && SIZEOF_REGISTER == 4 /* defined(__ia64__) */
- 
-+#include <mono/arch/mips/mips-codegen.h>
-+
- typedef struct {
- 	mgreg_t	    sc_pc;
- 	mgreg_t		sc_regs [32];
--- 
-2.1.0
-

package/mono/0004-jit-Move-the-ppc-sigctx-monoctx-conversion-code-to-m.patch deleted +0 ~~-92~~

92 lines not on this page · raw message

package/mono/0005-Fix-build-errors-in-mono-context.c-on-ppc64el.patch deleted +0 ~~-84~~

84 lines not on this page · raw message

package/mono/Config.in +0 ~~-22~~

index 1db5df4..a16f098 100644
@@ -14,27 +14,5 @@ config BR2_PACKAGE_MONO
 
 	  http://download.mono-project.com/sources/mono/
 
-if BR2_PACKAGE_MONO
-
-config BR2_PACKAGE_MONO_20
-	bool "2.0/3.5 .Net Runtime"
-	help
-	  This option enables the installation of the 2.0/3.5 version
-	  of the Mono .Net runtime to the target
-
-config BR2_PACKAGE_MONO_40
-	bool "4.0 .Net Runtime"
-	help
-	  This option enables the installation of the 4.0 version
-	  of the Mono .Net runtime to the target
-
-config BR2_PACKAGE_MONO_45
-	bool "4.5 .Net Runtime"
-	help
-	  This option enables the installation of the 4.5 version
-	  of the Mono .Net runtime to the target
-
-endif
-
 comment "mono needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS

package/mono/mono.mk +1 -8

index c9335ef..c0a0827 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MONO_VERSION = 3.12.0
+MONO_VERSION = 4.0.1
 MONO_SITE = http://download.mono-project.com/sources/mono
 MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2
 MONO_LICENSE = GPLv2 or MIT (compiler, tools), LGPLv2 (runtime libs), MIT (class libs) or commercial

@@ -48,13 +48,6 @@ HOST_MONO_CONF_OPTS = --disable-gtk-doc \
 	--enable-minimal=aot,profiler,debug \
 	--enable-static
 
-# These options refer to the target mono, not the host. We use the host
-# only to compile libraries, then we copy them to the target.
-HOST_MONO_CONF_OPTS += \
-	--with-profile2=$(if $(BR2_PACKAGE_MONO_20),yes,no) \
-	--with-profile4=$(if $(BR2_PACKAGE_MONO_40),yes,no) \
-	--with-profile4_5=$(if $(BR2_PACKAGE_MONO_45),yes,no)
-
 # ensure monolite is used
 HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false

Signature · 1 line

1.9.1

Thomas Petazzoni

2015-05-02 15:04 UTC #4 lore raw

PATCH v2 2/2 package/mono: bump to version 4.0.1

Dear Angelo Compagnucci,

Quoted 19 lines · Angelo Compagnucci

package/mono/Config.in +0 ~~-11~~

index 1db5df4..a16f098 100644
@@ -14,27 +14,5 @@ config BR2_PACKAGE_MONO
 
 	  http://download.mono-project.com/sources/mono/
 
-if BR2_PACKAGE_MONO
-
-config BR2_PACKAGE_MONO_20
-	bool "2.0/3.5 .Net Runtime"
-	help
-	  This option enables the installation of the 2.0/3.5 version
-	  of the Mono .Net runtime to the target
-
-config BR2_PACKAGE_MONO_40
-	bool "4.0 .Net Runtime"
-	help

package/mono/Config.in config BR2_PACKAGE_MONO · line 37

Quoted 10 lines

package/mono/Config.in +0 ~~-10~~

-	  This option enables the installation of the 4.0 version
-	  of the Mono .Net runtime to the target
-
-config BR2_PACKAGE_MONO_45
-	bool "4.5 .Net Runtime"
-	help
-	  This option enables the installation of the 4.5 version
-	  of the Mono .Net runtime to the target
-
-endif

When you remove options, you need to add Config.in.legacy handling for them.

Also, you forgot to remove the line:

  select BR2_PACKAGE_MONO_45 if !BR2_PACKAGE_MONO_20 && !BR2_PACKAGE_MONO_40

which didn't make sense anymore.

Committed with these issues fixed.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

2015-05-03 13:31 UTC #5 lore raw

PATCH v2 2/2 package/mono: bump to version 4.0.1

In reply to Angelo Compagnucci

Dear Angelo Compagnucci,

Quoted 7 lines · Angelo Compagnucci

This patch:
* bumps mono version to 4.0.1.
* Removes no more needed patches included upstream
* Removes profile switches no more present in configure
Signed-off-by Angelo Compagnucci <[email protected]>

Quoted 10 lines

---
 .../0003-mono-context.h-fix-build-on-MIPS.patch    | 33 --------
 ...e-ppc-sigctx-monoctx-conversion-code-to-m.patch | 92 ----------------------
 ...build-errors-in-mono-context.c-on-ppc64el.patch | 84 --------------------
 package/mono/Config.in                             | 22 ------
 package/mono/mono.mk                               |  9 +--
 5 files changed, 1 insertion(+), 239 deletions(-)
 delete mode 100644 package/mono/0003-mono-context.h-fix-build-on-MIPS.patch
 delete mode 100644 package/mono/0004-jit-Move-the-ppc-sigctx-monoctx-conversion-code-to-m.patch
 delete mode 100644 package/mono/0005-Fix-build-errors-in-mono-context.c-on-ppc64el.patch

This commit is causing a build failure:
http://autobuild.buildroot.org/results/b97/b97543b26f8bc25a9e997bb66434ae9660a2f198/build-end.log.
It might be a parallel installation issue:

/usr/bin/install: cannot create regular file /home/peko/autobuild/instance-0/output/host/usr/lib/mono/xbuild-frameworks/.NETFramework/v3.0/RedistList/FrameworkList.xml': File exists/usr/bin/install: cannot create regular file /home/peko/autobuild/instance-0/output/host/usr/lib/mono/xbuild/Microsoft/Portable/v4.5/Microsoft.Portable.Common.targets': File exists

Can you investigate?

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Angelo Compagnucci

author

2015-05-03 20:37 UTC #6 lore raw

PATCH v2 2/2 package/mono: bump to version 4.0.1

Dear Thomas Petazzoni,

2015-05-03 15:31 GMT+02:00 Thomas Petazzoni
<[email protected]>:

Quoted 21 lines

Dear Angelo Compagnucci,

Quoted 7 lines · Angelo Compagnucci

This patch:
* bumps mono version to 4.0.1.
* Removes no more needed patches included upstream
* Removes profile switches no more present in configure
Signed-off-by Angelo Compagnucci <[email protected]>

Quoted 10 lines

---
 .../0003-mono-context.h-fix-build-on-MIPS.patch    | 33 --------
 ...e-ppc-sigctx-monoctx-conversion-code-to-m.patch | 92 ----------------------
 ...build-errors-in-mono-context.c-on-ppc64el.patch | 84 --------------------
 package/mono/Config.in                             | 22 ------
 package/mono/mono.mk                               |  9 +--
 5 files changed, 1 insertion(+), 239 deletions(-)
 delete mode 100644 package/mono/0003-mono-context.h-fix-build-on-MIPS.patch
 delete mode 100644 package/mono/0004-jit-Move-the-ppc-sigctx-monoctx-conversion-code-to-m.patch
 delete mode 100644 package/mono/0005-Fix-build-errors-in-mono-context.c-on-ppc64el.patch

Quoted 7 lines

This commit is causing a build failure:
http://autobuild.buildroot.org/results/b97/b97543b26f8bc25a9e997bb66434ae9660a2f198/build-end.log.
It might be a parallel installation issue:
/usr/bin/install: cannot create regular file /home/peko/autobuild/instance-0/output/host/usr/lib/mono/xbuild-frameworks/.NETFramework/v3.0/RedistList/FrameworkList.xml': File exists/usr/bin/install: cannot create regular file /home/peko/autobuild/instance-0/output/host/usr/lib/mono/xbuild/Microsoft/Portable/v4.5/Microsoft.Portable.Common.targets': File exists
Can you investigate?

Sure! Honestly it seems a little strange for me, I had several compilation test and a system with mono running for a side project and this is not happened.

Tomorrow I will look to it.

Quoted 8 lines

Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Signature · 1 line

Profile: http://it.linkedin.com/in/compagnucciangelo

Peter Korsgaard

2015-05-03 21:14 UTC #7 lore raw

PATCH v2 2/2 package/mono: bump to version 4.0.1

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Angelo" == Angelo Compagnucci <[email protected]> writes:

Hi,

Quoted 6 lines

Quoted 6 lines
/usr/bin/install: cannot create regular file `/home/peko/autobuild/instance-0/output/host/usr/lib/mono/xbuild-frameworks/.NETFramework/v3.0/RedistList/FrameworkList.xml':
File exists/usr/bin/install: cannot create regular file `/home/peko/autobuild/instance-0/output/host/usr/lib/mono/xbuild/Microsoft/Portable/v4.5/Microsoft.Portable.Common.targets':
File exists

Quoted 7 lines

Quoted 1 line
Can you investigate?
Sure! Honestly it seems a little strange for me, I had several compilation test and a system with mono running for a side project and this is not happened.
Tomorrow I will look to it.

It looks like a parallel build issue with high BR2_JLEVEL settings. We could move to MAKE1 but that will probably slow down the build quite a bit.

Signature · 1 line

Bye, Peter Korsgaard

Angelo Compagnucci

author

2015-05-04 13:50 UTC #8 lore raw

PATCH v2 2/2 package/mono: bump to version 4.0.1

Dear Peter Korsgaard, Thomas Petazzoni,

2015-05-03 23:14 GMT+02:00 Peter Korsgaard <[email protected]>:

Quoted 12 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Angelo" == Angelo Compagnucci <[email protected]> writes:
Hi,
Quoted 7 lines
Quoted 7 lines
/usr/bin/install: cannot create regular file `/home/peko/autobuild/instance-0/output/host/usr/lib/mono/xbuild-frameworks/.NETFramework/v3.0/RedistList/FrameworkList.xml':
File exists/usr/bin/install: cannot create regular file `/home/peko/autobuild/instance-0/output/host/usr/lib/mono/xbuild/Microsoft/Portable/v4.5/Microsoft.Portable.Common.targets':
File exists
Can you investigate?

Quoted 8 lines

Quoted 5 lines
Sure! Honestly it seems a little strange for me, I had several compilation test and a system with mono running for a side project and this is not happened.
Tomorrow I will look to it.
It looks like a parallel build issue with high BR2_JLEVEL settings. We could move to MAKE1 but that will probably slow down the build quite a bit.

I cannot reproduce the problem here. I did several compilation with make and make -j (2-4-8-24-32) with various values but the compilation always ends correctly.
I used both the .config of autobuild, both other configs created for the purpose.

Please advice on a better way to help to debug this problem.

Quoted 3 lines

--
Bye, Peter Korsgaard

Sincerely, Angelo.

Signature · 1 line

Profile: http://it.linkedin.com/in/compagnucciangelo