From owner-freebsd-gnome  Tue Sep 10 10:11:29 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 DE48037B400
	for <gnome@FreeBSD.org>; Tue, 10 Sep 2002 10:11:26 -0700 (PDT)
Received: from gypsy.vrac.iastate.edu (gypsy.vrac.iastate.edu [129.186.232.122])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7A7E043E42
	for <gnome@FreeBSD.org>; Tue, 10 Sep 2002 10:11:26 -0700 (PDT)
	(envelope-from patrick@137.org)
Received: from 137.org (gfxn2.vrac.iastate.edu [129.186.232.116])
	by gypsy.vrac.iastate.edu (Postfix) with ESMTP id 9480E44A
	for <gnome@FreeBSD.org>; Tue, 10 Sep 2002 12:11:25 -0500 (CDT)
Message-ID: <3D7E27BD.1030708@137.org>
Date: Tue, 10 Sep 2002 12:11:25 -0500
From: Patrick Hartling <patrick@137.org>
Reply-To: patrick@137.org
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.0) Gecko/20020606
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: gnome@FreeBSD.org
Subject: Fix for building Mono on -current
Content-Type: multipart/mixed;
 boundary="------------050200040409030104070402"
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

This is a multi-part message in MIME format.
--------------050200040409030104070402
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

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).

  -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/

--------------050200040409030104070402
Content-Type: text/plain;
 name="mono.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="mono.patch"

*** 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)))

--------------050200040409030104070402--


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