diff options
| author | kefren <kefren> | 2009-02-12 19:44:50 +0000 |
|---|---|---|
| committer | kefren <kefren> | 2009-02-12 19:44:50 +0000 |
| commit | 204127adc42aa461927e7de3e7b045b196e1dca1 (patch) | |
| tree | e5f308a97cf156664ea0a8e5dbad7d1638170d2c /lang | |
| parent | 873bc73cd93a755d71b53925008585b3e3ae32d2 (diff) | |
| download | pkgsrc-204127adc42aa461927e7de3e7b045b196e1dca1.tar.gz | |
Fix Bug 475132 for amd64. Patch provided by Zoltan Varga
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/mono/Makefile | 4 | ||||
| -rw-r--r-- | lang/mono/distinfo | 3 | ||||
| -rw-r--r-- | lang/mono/patches/patch-ci | 21 |
3 files changed, 25 insertions, 3 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index b06bcebca32..6c4bb263c90 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.79 2009/02/11 21:03:10 kefren Exp $ +# $NetBSD: Makefile,v 1.80 2009/02/12 19:44:50 kefren Exp $ DISTNAME= mono-${MONO_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/ EXTRACT_SUFX= .tar.bz2 diff --git a/lang/mono/distinfo b/lang/mono/distinfo index 56a4967e5de..8258e007e0b 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.43 2009/01/19 22:35:53 kefren Exp $ +$NetBSD: distinfo,v 1.44 2009/02/12 19:44:50 kefren Exp $ SHA1 (mono-2.2.tar.bz2) = 028c061ba4f4631c4ff10a15b832211a67ec5858 RMD160 (mono-2.2.tar.bz2) = 664f09ccd8822b62d94d242871b956b00adae7b6 @@ -29,3 +29,4 @@ SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0 SHA1 (patch-cf) = 2ae0f528e3273a51c4e2582d6580768072c50008 SHA1 (patch-cg) = 93a81dccbc8ac006e97be6641de9b4625263f3d5 SHA1 (patch-ch) = 4ca88b9e6c45263c9fd75a573ff1b149197363dc +SHA1 (patch-ci) = 9c6d77c4c76c618304e62f744b0d03bb58df5d93 diff --git a/lang/mono/patches/patch-ci b/lang/mono/patches/patch-ci new file mode 100644 index 00000000000..a9fe375d413 --- /dev/null +++ b/lang/mono/patches/patch-ci @@ -0,0 +1,21 @@ +$NetBSD: patch-ci,v 1.3 2009/02/12 19:44:50 kefren Exp $ +--- mono/mini/mini-amd64.c.orig 2008-11-11 06:56:14.000000000 +0200 ++++ mono/mini/mini-amd64.c 2009-02-12 21:06:56.000000000 +0200 +@@ -6300,10 +6300,14 @@ + else + item->chunk_size += MOV_REG_IMM_SIZE + CMP_REG_REG_SIZE; + } +- if (vtable_is_32bit) +- item->chunk_size += MOV_REG_IMM_32BIT_SIZE; +- else ++ if (fail_tramp) { + item->chunk_size += MOV_REG_IMM_SIZE; ++ } else { ++ if (vtable_is_32bit) ++ item->chunk_size += MOV_REG_IMM_32BIT_SIZE; ++ else ++ item->chunk_size += MOV_REG_IMM_SIZE; ++ } + item->chunk_size += BR_SMALL_SIZE + JUMP_REG_SIZE; + } else { + if (fail_tramp) { |