From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4FC7139695 for ; Tue, 6 Jun 2017 10:36:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28B3F21C072; Tue, 6 Jun 2017 10:36:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 051C021C03C for ; Tue, 6 Jun 2017 10:36:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D730D341974 for ; Tue, 6 Jun 2017 10:36:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46EDF746D for ; Tue, 6 Jun 2017 10:36:46 +0000 (UTC) From: "Mikhail Pukhlikov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikhail Pukhlikov" Message-ID: <1496741178.0ac994b1059a9b51f957965175bb05528fc36163.cynede@gentoo> Subject: [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/ X-VCS-Repository: proj/dotnet X-VCS-Files: dev-lang/mono/files/mono-5.0.1.1-x86_32.patch dev-lang/mono/mono-5.0.1.1.ebuild X-VCS-Directories: dev-lang/mono/files/ dev-lang/mono/ X-VCS-Committer: cynede X-VCS-Committer-Name: Mikhail Pukhlikov X-VCS-Revision: 0ac994b1059a9b51f957965175bb05528fc36163 X-VCS-Branch: master Date: Tue, 6 Jun 2017 10:36:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a105f99e-eb10-4e44-ae40-67fce4e4d29f X-Archives-Hash: b7c63f97e783f42a7c1ab4100fcfad1d commit: 0ac994b1059a9b51f957965175bb05528fc36163 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Jun 6 09:23:19 2017 +0000 Commit: Mikhail Pukhlikov gentoo org> CommitDate: Tue Jun 6 09:26:18 2017 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=0ac994b1 dev-lang/mono: forward-port mono-4.8.0.371-x86_32.patch Bug: https://github.com/gentoo/dotnet/issues/300 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Manifest-Sign-Key: 0x71A1EE76611FF3AA dev-lang/mono/files/mono-5.0.1.1-x86_32.patch | 21 +++++++++++++++++++++ dev-lang/mono/mono-5.0.1.1.ebuild | 8 +++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch b/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch new file mode 100644 index 0000000..08d443a --- /dev/null +++ b/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch @@ -0,0 +1,21 @@ +Native toolchain can default to different ABI (amd64 in bug case). +Set target to i386. +https://bugs.gentoo.org/600664 +diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c +index 0656a57..690c96b 100644 +--- a/mono/mini/aot-compiler.c ++++ b/mono/mini/aot-compiler.c +@@ -9926,4 +9926,6 @@ compile_asm (MonoAotCompile *acfg) + #ifdef TARGET_WIN32_MSVC + #define AS_OPTIONS "-c -x assembler" ++#elif defined(TARGET_X86) && !defined(TARGET_MACH) ++#define AS_OPTIONS "--32" + #elif defined(TARGET_AMD64) && !defined(TARGET_MACH) + #define AS_OPTIONS "--64" +@@ -9981,4 +9983,6 @@ compile_asm (MonoAotCompile *acfg) + #elif defined(TARGET_POWERPC64) + #define LD_OPTIONS "-m elf64ppc" ++#elif defined(TARGET_X86) ++#define LD_OPTIONS "-m elf_i386" + #endif + diff --git a/dev-lang/mono/mono-5.0.1.1.ebuild b/dev-lang/mono/mono-5.0.1.1.ebuild index 14e9ef4..2640c83 100644 --- a/dev-lang/mono/mono-5.0.1.1.ebuild +++ b/dev-lang/mono/mono-5.0.1.1.ebuild @@ -12,7 +12,6 @@ SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2" LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" SLOT="0" -#TODO: update patch: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0e31adf6af28adf3c8709e542ecf7039cb5942 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" IUSE="nls minimal pax_kernel xen doc" @@ -33,10 +32,9 @@ DEPEND="${COMMONDEPEND} !dev-lang/mono-basic " -#PATCHES=( -# "${FILESDIR}"/${PN}-4.8.0.371-makedev.patch -# "${FILESDIR}"/${PN}-4.8.0.371-x86_32.patch -#) +PATCHES=( + "${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch +) #S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"