From patchwork Tue May 23 10:20:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 765844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wXBPk3mnfz9sPD for ; Tue, 23 May 2017 20:20:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ECwdcQPu"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AC2E186147; Tue, 23 May 2017 10:20:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S5LJfFlPTkDi; Tue, 23 May 2017 10:20:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 73EB886105; Tue, 23 May 2017 10:20:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4A7761C2DED for ; Tue, 23 May 2017 10:20:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 35B45860F5 for ; Tue, 23 May 2017 10:20:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b7kGRn2WDHSB for ; Tue, 23 May 2017 10:20:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9F63B860DC for ; Tue, 23 May 2017 10:20:47 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id k15so36890960wmh.3 for ; Tue, 23 May 2017 03:20:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/viK9vxgRhhWgn/Hqvo4GGtkZCnk2UDTzrVVJkkCvg0=; b=ECwdcQPuDod3L0Feep51J/FyGOKFqSELKVX9TMJ3fzKYzGLArKEis97G/x9tseGtbu 15P13Z+RSNMrPNIXcJvVMEnxrkoypLJ/tjDz7pGl4tWQhL6kL246QOd72Nx1VwTR0z4e IF4oDigaAqiC6ErAUTuBIul+ibRF7Asx7YA7uydsbqcnxW8v7eDTj3UY43NdY0e7Hu4N VTxBIzuRsdxtVB7NwDANtZIjtL1ictrVtEC3a0cVnqDO1Vfyp/LDk3qLDkBcZMInFcMc uuDlj1SRzc3dTxXjVD2apkUy1D1h3CdVMACWObpy9YOC2+yn8ztPSikj7RsXw6SZIwKK g61A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/viK9vxgRhhWgn/Hqvo4GGtkZCnk2UDTzrVVJkkCvg0=; b=FyeuZla/WAbVbo2M1E+X7ywvpTKRJ5OWt/qVi5EKiWs2wrbcYSUKboEyP5vuScVra/ uRySN4Y+1LqsIeyKf54eIJo7k7IktELLpOqoGKG2s4wN+ESeTDCYHG0WVT2VS5d2cmbS CCPxmjxG4nZCCAZ1ExKfkeGQheIR+M0zzFBBWPqQE0VqOcKCPKscNKaQ6+6fc5F1ucAW sr1GGuXCd9ApYIZkA7+reahS9OcZbwkk9XdfO7cm5OKmq5nM55RXidfcHgaiVxBuHYDh iNstqxKp52y2LnK0JjVObHlV7JJce1xpHVklekQH+s91ToplZ5c1cLmBrKIJ3qp1VCuG 2j2g== X-Gm-Message-State: AODbwcDJ+g9v313kJthvbqAbyi+BKf0n9bIDwqh0+PvKrv9916Y268+c 9oBs4GZ8dHjjfAXXu+M= X-Received: by 10.28.102.65 with SMTP id a62mr1704348wmc.21.1495534845709; Tue, 23 May 2017 03:20:45 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id 43sm472867wrx.26.2017.05.23.03.20.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 May 2017 03:20:45 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 23 May 2017 12:20:35 +0200 Message-Id: <1495534835-12702-2-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495534835-12702-1-git-send-email-angelo.compagnucci@gmail.com> References: <1495534835-12702-1-git-send-email-angelo.compagnucci@gmail.com> Subject: [Buildroot] [PATCH 2/2] package/mono: bump to version 4.8.1.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch bumps mono the version 4.8.1.0. Simultaneously it removes an upstreamed patch and updates another one to the latest source code. It disables also aot compilation cause the build system was fixed to support this option again. It disables also the compilation of the optional BoringTLS stack: this stack it's distributed as an external component inside the mono source tree and it carries it's own build system (cmake). To be compiled inside buildroot it requires hacking the mono build system to pass the correct compiling options to cmake. This will be done in a future patch set. Signed-off-by: Angelo Compagnucci --- ...6-Remove-unit-tests-from-mono-compilation.patch | 20 +++++----- ...009-fix-musl-incorrect-sigcontext-include.patch | 44 ---------------------- package/mono/mono.hash | 2 +- package/mono/mono.mk | 12 +++--- 4 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 package/mono/0009-fix-musl-incorrect-sigcontext-include.patch diff --git a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch index 3714b65..6adbd81 100644 --- a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch +++ b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch @@ -1,6 +1,6 @@ -From 155f96953d1b898f04a4e708c9ebc1e450b2f63e Mon Sep 17 00:00:00 2001 +From 357bea890354acda52aa6dfaec7fa232fa0b8208 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci -Date: Tue, 24 Nov 2015 23:11:10 +0100 +Date: Tue, 23 May 2017 11:19:58 +0200 Subject: [PATCH] Remove unit-tests from mono compilation This patch fixes compiling errors with unit-tests under linux. @@ -11,19 +11,19 @@ Signed-off-by: Angelo Compagnucci 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mono/Makefile.am b/mono/Makefile.am -index ef41dfe..7129507 100644 +index 8c9c2cb..7af36ec 100644 --- a/mono/Makefile.am +++ b/mono/Makefile.am -@@ -30,7 +30,7 @@ monotouch-do-clean: - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ +@@ -34,7 +34,7 @@ monotouch-do-clean: + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ done; else --SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler +-SUBDIRS = $(btls_dirs) arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler ++SUBDIRS = $(btls_dirs) arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler endif endif --DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler +-DIST_SUBDIRS = btls arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler ++DIST_SUBDIRS = btls arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler -- -1.9.1 +2.7.4 diff --git a/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch b/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch deleted file mode 100644 index 3d932b6..0000000 --- a/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 63f0b0246b8125ae48b15bd182bb5831be02e6c9 Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Mon, 27 Jun 2016 21:32:11 +0200 -Subject: [PATCH] fix musl incorrect sigcontext include - -On musl __GLIBC__ is not defined, so the conditional logic will -not produce correct result. Add a specific case to handle when -__GLIBC__ is not defined. - -Signed-off-by: Angelo Compagnucci ---- - libgc/os_dep.c | 2 +- - mono/mini/exceptions-arm.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgc/os_dep.c b/libgc/os_dep.c -index 8c8e098..34859c1 100644 ---- a/libgc/os_dep.c -+++ b/libgc/os_dep.c -@@ -32,7 +32,7 @@ - /* prototypes, so we have to include the top-level sigcontext.h to */ - /* make sure the former gets defined to be the latter if appropriate. */ - # include --# if 2 <= __GLIBC__ -+# if 2 <= __GLIBC__ || !defined(__GLIBC__) - # if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__ - /* glibc 2.1 no longer has sigcontext.h. But signal.h */ - /* has the right declaration for glibc 2.1. */ -diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c -index b036aa7..a3e2164 100644 ---- a/mono/mini/exceptions-arm.c -+++ b/mono/mini/exceptions-arm.c -@@ -14,7 +14,7 @@ - #include - - #ifndef MONO_CROSS_COMPILE --#ifdef HAVE_ASM_SIGCONTEXT_H -+#if defined(HAVE_ASM_SIGCONTEXT_H) && defined(__GLIBC__) - #include - #endif /* def HAVE_ASM_SIGCONTEXT_H */ - #endif --- -1.9.1 - diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 6719fec..89b8ed0 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 8965d107f4ebf4583ba1b50e0dcad39f0dc6adac8df7a083e9c5879ad93c0ea4 mono-4.6.2.16.tar.bz2 +sha256 18cb38a670e51609c36c687ed90ad42cfedabeffd0a2dc5f7f0c46249eb8dbef mono-4.8.1.0.tar.bz2 diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 58dfab7..b066bc6 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 4.6.2.16 +MONO_VERSION = 4.8.1.0 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2 MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial @@ -20,9 +20,10 @@ MONO_AUTORECONF = YES # Disable managed code (mcs folder) from building MONO_CONF_OPTS = --with-mcs-docs=no \ --with-ikvm-native=no \ - --enable-minimal=profiler,debug \ + --enable-minimal=profiler,debug,aot \ --disable-mcs-build \ - --enable-static + --enable-static \ + --disable-btls # The libraries have been built by the host-mono build. Since they are # architecture-independent, we simply copy them to the target. @@ -45,8 +46,9 @@ MONO_DEPENDENCIES += host-mono HOST_MONO_CONF_OPTS = --with-mcs-docs=no \ --disable-libraries \ --with-ikvm-native=no \ - --enable-minimal=profiler,debug \ - --enable-static + --enable-minimal=profiler,debug,aot \ + --enable-static \ + --disable-btls # ensure monolite is used HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false