| 1 |
commit: 0ac994b1059a9b51f957965175bb05528fc36163 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 6 09:23:19 2017 +0000 |
| 4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 6 09:26:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=0ac994b1 |
| 7 |
|
| 8 |
dev-lang/mono: forward-port mono-4.8.0.371-x86_32.patch |
| 9 |
|
| 10 |
Bug: https://github.com/gentoo/dotnet/issues/300 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
Manifest-Sign-Key: 0x71A1EE76611FF3AA |
| 13 |
|
| 14 |
dev-lang/mono/files/mono-5.0.1.1-x86_32.patch | 21 +++++++++++++++++++++ |
| 15 |
dev-lang/mono/mono-5.0.1.1.ebuild | 8 +++----- |
| 16 |
2 files changed, 24 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..08d443a |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch |
| 23 |
@@ -0,0 +1,21 @@ |
| 24 |
+Native toolchain can default to different ABI (amd64 in bug case). |
| 25 |
+Set target to i386. |
| 26 |
+https://bugs.gentoo.org/600664 |
| 27 |
+diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c |
| 28 |
+index 0656a57..690c96b 100644 |
| 29 |
+--- a/mono/mini/aot-compiler.c |
| 30 |
++++ b/mono/mini/aot-compiler.c |
| 31 |
+@@ -9926,4 +9926,6 @@ compile_asm (MonoAotCompile *acfg) |
| 32 |
+ #ifdef TARGET_WIN32_MSVC |
| 33 |
+ #define AS_OPTIONS "-c -x assembler" |
| 34 |
++#elif defined(TARGET_X86) && !defined(TARGET_MACH) |
| 35 |
++#define AS_OPTIONS "--32" |
| 36 |
+ #elif defined(TARGET_AMD64) && !defined(TARGET_MACH) |
| 37 |
+ #define AS_OPTIONS "--64" |
| 38 |
+@@ -9981,4 +9983,6 @@ compile_asm (MonoAotCompile *acfg) |
| 39 |
+ #elif defined(TARGET_POWERPC64) |
| 40 |
+ #define LD_OPTIONS "-m elf64ppc" |
| 41 |
++#elif defined(TARGET_X86) |
| 42 |
++#define LD_OPTIONS "-m elf_i386" |
| 43 |
+ #endif |
| 44 |
+ |
| 45 |
|
| 46 |
diff --git a/dev-lang/mono/mono-5.0.1.1.ebuild b/dev-lang/mono/mono-5.0.1.1.ebuild |
| 47 |
index 14e9ef4..2640c83 100644 |
| 48 |
--- a/dev-lang/mono/mono-5.0.1.1.ebuild |
| 49 |
+++ b/dev-lang/mono/mono-5.0.1.1.ebuild |
| 50 |
@@ -12,7 +12,6 @@ SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2" |
| 51 |
LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" |
| 52 |
SLOT="0" |
| 53 |
|
| 54 |
-#TODO: update patch: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0e31adf6af28adf3c8709e542ecf7039cb5942 |
| 55 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" |
| 56 |
|
| 57 |
IUSE="nls minimal pax_kernel xen doc" |
| 58 |
@@ -33,10 +32,9 @@ DEPEND="${COMMONDEPEND} |
| 59 |
!dev-lang/mono-basic |
| 60 |
" |
| 61 |
|
| 62 |
-#PATCHES=( |
| 63 |
-# "${FILESDIR}"/${PN}-4.8.0.371-makedev.patch |
| 64 |
-# "${FILESDIR}"/${PN}-4.8.0.371-x86_32.patch |
| 65 |
-#) |
| 66 |
+PATCHES=( |
| 67 |
+ "${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch |
| 68 |
+) |
| 69 |
|
| 70 |
#S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" |
Archives