From patchwork Tue May 29 20:50:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 922385 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="MM32hLUo"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40wQpn2yGXz9s0q for ; Wed, 30 May 2018 06:50:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CFC8A86105; Tue, 29 May 2018 20:50:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DZe3mOt3LlOf; Tue, 29 May 2018 20:50:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6FD8F86107; Tue, 29 May 2018 20:50:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E66A71CF1B2 for ; Tue, 29 May 2018 20:50:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E32C224DF9 for ; Tue, 29 May 2018 20:50:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gj8weZGDwOMH for ; Tue, 29 May 2018 20:50:10 +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 silver.osuosl.org (Postfix) with ESMTPS id EDCA62471E for ; Tue, 29 May 2018 20:50:09 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id m129-v6so43691819wmb.3 for ; Tue, 29 May 2018 13:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=7Mv4ruIX2HAwBkKq7EZCnNkgz1x+HijcywuKF+vQCmg=; b=MM32hLUoqM98L5z2AGgzyh+Ccx8njXA5Vv374gTbrIAbvzZXmhAJmW7TTcHJmWhgy1 MyVTqeta22NxHo78s7q8aA6zcrDo35RrdcvNou3fmQcMEPvjJbw94JKyqpInpLHecRd5 Jzfc7fdBAoGUSxSJVRSZwtAksfQAr52dDJnBA= 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; bh=7Mv4ruIX2HAwBkKq7EZCnNkgz1x+HijcywuKF+vQCmg=; b=fXnQcs6zT7AxylrEeB/SZViDEYKcCa4yy4kh/aE0mEjAfAeUKsp44ODdLfbm3wIZkc g23VrWvUeUIhq1cekRDAXeCZh/lWcgQt5ASPO954fu73CI6t/ZzL3Ezf1v8EG5V84x4/ oPOhdyEhFaWn8KRbXgK6QejUDuHmbta+Rjc1YFIlNsIW5bJR4TyESexeTxWWvbOTjOzY 6l7qw9Q1A/z7kXtqVoNp7tnj9XR50ifArAyJ4WCiLmdCASSrWpCLp5fPOYRt2R94dGrn 6Sus2Lfq8AzgG0S6k/2MiAUfpTGADCk9x6KRsEcKE4W2jaaeLFxpQi4MX5ArBsEb6h4L 82Nw== X-Gm-Message-State: ALKqPwdE8kgz2xxDcsxxS31IOZabz4RV6/8D+Aenmo8EQ/7cZLSRl6MJ 4TSHkVdRUNrkRJUhtK6nYDl60v/1enc= X-Google-Smtp-Source: ADUXVKLZ8IwdzvntOnFC32Ag8JE0jQ93VqfaH3BPPJ+0WcuaF2njmqYl/Zm7XW62JuKe2gJqrhZZDg== X-Received: by 2002:a1c:12d0:: with SMTP id 199-v6mr232005wms.153.1527627007658; Tue, 29 May 2018 13:50:07 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id a8-v6sm23192300wrc.18.2018.05.29.13.50.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 May 2018 13:50:06 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 29 May 2018 22:50:03 +0200 Message-Id: <1527627003-6738-1-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH] package/mono: bump to version 5.12.0.226 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch bumps mono to version 5.12.0.226 and it's monolite dependency to version 1051200002, doing so it removes also a couple of upstreamed patches. This new mono version requires also a different option for managing aot, so this patch refactors also the configure options. Signed-off-by: Angelo Compagnucci --- ...4-fixing-initialization-of-have-vasprintf.patch | 29 ---------------------- ...6-Remove-unit-tests-from-mono-compilation.patch | 29 ---------------------- package/mono/mono.hash | 2 +- package/mono/mono.mk | 21 +++++++--------- package/monolite/monolite.hash | 2 +- package/monolite/monolite.mk | 2 +- 6 files changed, 12 insertions(+), 73 deletions(-) delete mode 100644 package/mono/0004-fixing-initialization-of-have-vasprintf.patch delete mode 100644 package/mono/0006-Remove-unit-tests-from-mono-compilation.patch diff --git a/package/mono/0004-fixing-initialization-of-have-vasprintf.patch b/package/mono/0004-fixing-initialization-of-have-vasprintf.patch deleted file mode 100644 index 5564859..0000000 --- a/package/mono/0004-fixing-initialization-of-have-vasprintf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1c3d615d93b20d10c2729478d5104977dd9af23f Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Wed, 5 Aug 2015 12:59:45 +0200 -Subject: [PATCH] Fixing initialization of have_vasprintf - -This patch initialize properly have_vasprintf in case vasprint function is found. -Solves multiple definition of `vasprintf' error in case vasprint is not properly detected. - -Patch is upstream: - - https://github.com/mono/mono/commit/40c171799b671718969ee28a02f92884d7fd181e - -Signed-off-by: Angelo Compagnucci ---- - eglib/configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eglib/configure.ac b/eglib/configure.ac -index 5281419..4bf91e5 100644 ---- a/eglib/configure.ac -+++ b/eglib/configure.ac -@@ -135,6 +135,7 @@ AC_CHECK_SIZEOF(void *) - AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long) - AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf) -+AC_CHECK_FUNC(vasprintf, have_vasprintf=yes) - AC_CHECK_FUNCS(getrlimit) - - # diff --git a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch deleted file mode 100644 index a3e88e7..0000000 --- a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 26e31fc54af591bdd88d6a4a79b7fa91c57f4b0c Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Thu, 10 Aug 2017 23:30:05 +0200 -Subject: [PATCH] Remove unit-tests from mono compilation - -This patch fixes compiling errors with unit-tests under linux. - -Signed-off-by: Angelo Compagnucci ---- - mono/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mono/Makefile.am b/mono/Makefile.am -index 8c9c2cb..7af36ec 100644 ---- a/mono/Makefile.am -+++ b/mono/Makefile.am -@@ -34,7 +34,7 @@ monotouch-do-clean: - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ - done; - else --SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler - endif - endif --DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler --- -2.7.4 - diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 8503950..47e3442 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 2a2f5c2a214a9980c086ac7561a5dd106f13d823a630de218eabafe1d995c5b4 mono-5.4.0.201.tar.bz2 +sha256 f0636baa0c1399805526142e799cb697ddccf736e506cf1a30a870eaa2830a89 mono-5.12.0.226.tar.bz2 diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 802c1d4..50c4c01 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 5.4.0.201 +MONO_VERSION = 5.12.0.226 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 @@ -17,13 +17,15 @@ MONO_INSTALL_STAGING = YES # patching configure.ac MONO_AUTORECONF = YES -# Disable managed code (mcs folder) from building -MONO_CONF_OPTS = --with-mcs-docs=no \ +MONO_SHARED_CONF_OPTS = --with-mcs-docs=no \ --with-ikvm-native=no \ - --enable-minimal=profiler,debug,aot \ - --disable-mcs-build \ + --enable-minimal=profiler,debug \ --enable-static \ - --disable-btls + --disable-btls \ + --disable-system-aot + +# Disable managed code (mcs folder) from building +MONO_CONF_OPTS = $(MONO_SHARED_CONF_OPTS) --disable-mcs-build # The libraries have been built by the host-mono build. Since they are # architecture-independent, we simply copy them to the target. @@ -42,12 +44,7 @@ MONO_DEPENDENCIES += host-mono ## Mono managed -HOST_MONO_CONF_OPTS = --with-mcs-docs=no \ - --disable-libraries \ - --with-ikvm-native=no \ - --enable-minimal=profiler,debug,aot \ - --enable-static \ - --disable-btls +HOST_MONO_CONF_OPTS = $(MONO_SHARED_CONF_OPTS) --disable-libraries # ensure monolite is used HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false diff --git a/package/monolite/monolite.hash b/package/monolite/monolite.hash index 76f5467..77810a9 100644 --- a/package/monolite/monolite.hash +++ b/package/monolite/monolite.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 8c893c3eb3efb5006e19fb45a878860265c3f47fbaf2470be47612e84725d9fd monolite-linux-1050400003-latest.tar.gz +sha256 fece21adc06118fa5d79d3621a5fc702ec354abf83be29a36f8718645a2dc058 monolite-linux-1051200002-latest.tar.gz diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk index 80b2af9..4e1d548 100644 --- a/package/monolite/monolite.mk +++ b/package/monolite/monolite.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONOLITE_VERSION = 1050400003 +MONOLITE_VERSION = 1051200002 MONOLITE_SITE = http://download.mono-project.com/monolite MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz MONOLITE_LICENSE = LGPL-2.0 or commercial