From owner-freebsd-openoffice@FreeBSD.ORG Wed Oct 24 18:41:00 2007 Return-Path: Delivered-To: openoffice@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2C9D16A417 for ; Wed, 24 Oct 2007 18:41:00 +0000 (UTC) (envelope-from faber@ISI.EDU) Received: from boreas.isi.edu (boreas.isi.edu [128.9.160.161]) by mx1.freebsd.org (Postfix) with ESMTP id A0B1313C48E for ; Wed, 24 Oct 2007 18:41:00 +0000 (UTC) (envelope-from faber@ISI.EDU) Received: from hut.isi.edu (hut.isi.edu [128.9.168.160]) by boreas.isi.edu (8.13.8/8.13.8) with ESMTP id l9OIQQ4p000687 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 24 Oct 2007 11:26:26 -0700 (PDT) Received: (from faber@localhost) by hut.isi.edu (8.14.1/8.14.1/Submit) id l9OIQPfC031651; Wed, 24 Oct 2007 11:26:25 -0700 (PDT) (envelope-from faber) Date: Wed, 24 Oct 2007 11:26:25 -0700 From: Ted Faber To: openoffice@FreeBSD.org Message-ID: <20071024182625.GE12734@hut.isi.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="XIiC+We3v3zHqZ6Z" Content-Disposition: inline User-Agent: Mutt/1.4.2.3i X-url: http://www.isi.edu/~faber X-ISI-4-43-8-MailScanner: Found to be clean X-MailScanner-From: faber@hut.isi.edu Cc: Ted Faber Subject: patch to compile lang/gcc-ooo on -CURRENT (FreeBSD 8) X-BeenThere: freebsd-openoffice@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting OpenOffice to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2007 18:41:00 -0000 --XIiC+We3v3zHqZ6Z Content-Type: multipart/mixed; boundary="Uwl7UQhJk99r8jnw" Content-Disposition: inline --Uwl7UQhJk99r8jnw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I don't know if you still need the lang/gcc-ooo port to build openoffice (or for any other reason) but it's currently broken by the bump to FreeBSD 8.0. Attached is a patch that works for me to fix it. Let me know if you'd rather I file a pr or something. --=20 Ted Faber http://www.isi.edu/~faber PGP: http://www.isi.edu/~faber/pubkeys.= asc Unexpected attachment on this mail? See http://www.isi.edu/~faber/FAQ.html#= SIG --Uwl7UQhJk99r8jnw Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.oo" diff -ruN gcc-ooo.bak/files/patch-freebsd-spec.h gcc-ooo/files/patch-freebsd-spec.h --- gcc-ooo.bak/files/patch-freebsd-spec.h 2005-08-28 01:00:11.000000000 -0700 +++ gcc-ooo/files/patch-freebsd-spec.h 2007-10-24 11:07:04.000000000 -0700 @@ -1,11 +1,13 @@ --- gcc/config/freebsd-spec.h.orig Wed Mar 3 07:34:55 2004 +++ gcc/config/freebsd-spec.h Sat Aug 13 18:47:14 2005 -@@ -51,7 +51,9 @@ +@@ -51,7 +51,11 @@ #define FBSD_TARGET_OS_CPP_BUILTINS() \ do \ { \ - if (FBSD_MAJOR == 6) \ -+ if (FBSD_MAJOR == 7) \ ++ if (FBSD_MAJOR == 8) \ ++ builtin_define ("__FreeBSD__=8"); \ ++ else if (FBSD_MAJOR == 7) \ + builtin_define ("__FreeBSD__=7"); \ + else if (FBSD_MAJOR == 6) \ builtin_define ("__FreeBSD__=6"); \ diff -ruN gcc-ooo.bak/files/patch-gcc+config.gcc gcc-ooo/files/patch-gcc+config.gcc --- gcc-ooo.bak/files/patch-gcc+config.gcc 2005-08-28 01:00:11.000000000 -0700 +++ gcc-ooo/files/patch-gcc+config.gcc 2007-10-24 11:13:16.000000000 -0700 @@ -1,11 +1,13 @@ --- gcc/config.gcc.orig Thu Apr 22 00:12:35 2004 +++ gcc/config.gcc Sat Aug 13 10:17:42 2005 -@@ -400,6 +400,8 @@ +@@ -400,6 +400,10 @@ tm_defines="${tm_defines} FBSD_MAJOR=5" ;; *-*-freebsd6 | *-*-freebsd[6].*) tm_defines="${tm_defines} FBSD_MAJOR=6" ;; + *-*-freebsd7 | *-*-freebsd[7].*) + tm_defines="${tm_defines} FBSD_MAJOR=7" ;; ++ *-*-freebsd8 | *-*-freebsd[8].*) ++ tm_defines="${tm_defines} FBSD_MAJOR=8" ;; *) echo 'Please update *-*-freebsd* in gcc/config.gcc' exit 1 --Uwl7UQhJk99r8jnw-- --XIiC+We3v3zHqZ6Z Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFHH45RaUz3f+Zf+XsRAtvfAKC+SXCxwCaEibWLwSHpxzjtiirRmACdGTDM YfWvJfqQ3+99v8CAwGUhmXM= =GJed -----END PGP SIGNATURE----- --XIiC+We3v3zHqZ6Z--