From owner-freebsd-gnome  Tue Sep 10 11:26:31 2002
Delivered-To: freebsd-gnome@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CBC0237B400
	for <gnome@FreeBSD.ORG>; Tue, 10 Sep 2002 11:26:28 -0700 (PDT)
Received: from creme-brulee.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3A81643E3B
	for <gnome@FreeBSD.ORG>; Tue, 10 Sep 2002 11:26:28 -0700 (PDT)
	(envelope-from marcus@marcuscom.com)
Received: from [10.2.1.0] (vpn-client-0.marcuscom.com [10.2.1.0])
	by creme-brulee.marcuscom.com (8.12.5/8.12.5) with ESMTP id g8AIO4iv090261;
	Tue, 10 Sep 2002 14:24:05 -0400 (EDT)
	(envelope-from marcus@marcuscom.com)
Subject: Re: Fix for building Mono on -current
From: Joe Marcus Clarke <marcus@marcuscom.com>
To: patrick@137.org
Cc: gnome@FreeBSD.ORG
In-Reply-To: <3D7E27BD.1030708@137.org>
References: <3D7E27BD.1030708@137.org>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
X-Mailer: Ximian Evolution 1.0.8 
Date: 10 Sep 2002 14:26:07 -0400
Message-Id: <1031682368.320.34.camel@gyros.marcuscom.com>
Mime-Version: 1.0
X-Spam-Status: No, hits=-3.9 required=5.0
	tests=IN_REP_TO,DOUBLE_CAPSWORD,AWL
	version=2.31
Sender: owner-freebsd-gnome@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-gnome.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-gnome>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-gnome>
X-Loop: FreeBSD.ORG

On Tue, 2002-09-10 at 13:11, Patrick Hartling wrote:
> The attached patch gets Mono 0.13 (and 0.15) to build on -current.  The 
> problem isn't with the compiler but with FreeBSD 4.x not defining ELFMAG 
> in its sys/elf_common.h.  ELFMAG was added to sys/elf_common.h in 
> -current September 8, 2001, and the __FreeBSD_version value tested in the 
> patch was bumped September 14, 2001 (Revision 1.102).

Committed, thanks.

> 
>   -Patrick
> 
> 
> -- 
> Patrick L. Hartling			| Research Assistant, VRAC
> patrick@137.org 
> 			| 2274 Howe Hall Room 2624
> PGP: http://www.137.org/patrick/pgp.txt	| T: +1.515.294.4916
> http://www.137.org/patrick/ 
> 	| http://www.vrac.iastate.edu/
> ----
> 

> *** mono/metadata/debug-symfile.c.bak	Mon Jul  8 19:49:49 2002
> --- mono/metadata/debug-symfile.c	Tue Sep 10 11:49:31 2002
> ***************
> *** 2,7 ****
> --- 2,8 ----
>   #include <stdlib.h>
>   #include <string.h>
>   #include <signal.h>
> + #include <sys/param.h>
>   #include <mono/metadata/metadata.h>
>   #include <mono/metadata/rawbuffer.h>
>   #include <mono/metadata/tokentype.h>
> ***************
> *** 165,171 ****
>   get_sections (MonoDebugSymbolFile *symfile, gboolean emit_warnings)
>   {
>   #ifdef HAVE_ELF_H
> ! #ifdef __FreeBSD__
>   	static const char ELFMAG[] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3, 0 };
>   #endif
>   	if (!strncmp (symfile->raw_contents, ELFMAG, strlen (ELFMAG)))
> --- 166,172 ----
>   get_sections (MonoDebugSymbolFile *symfile, gboolean emit_warnings)
>   {
>   #ifdef HAVE_ELF_H
> ! #if defined(__FreeBSD__) && __FreeBSD_version < 500023
>   	static const char ELFMAG[] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3, 0 };
>   #endif
>   	if (!strncmp (symfile->raw_contents, ELFMAG, strlen (ELFMAG)))
-- 
PGP Key : http://www.marcuscom.com/pgp.asc


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message