From owner-freebsd-openoffice@FreeBSD.ORG Tue Aug 16 02:03:52 2005 Return-Path: X-Original-To: freebsd-openoffice@freebsd.org Delivered-To: freebsd-openoffice@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CC5116A423 for ; Tue, 16 Aug 2005 02:03:52 +0000 (GMT) (envelope-from chat95@mac.com) Received: from smtpout.mac.com (smtpout.mac.com [17.250.248.87]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2653743D45 for ; Tue, 16 Aug 2005 02:03:52 +0000 (GMT) (envelope-from chat95@mac.com) Received: from mac.com (smtpin07-en2 [10.13.10.152]) by smtpout.mac.com (Xserve/8.12.11/smtpout05/MantshX 4.0) with ESMTP id j7G23nf3013463; Mon, 15 Aug 2005 19:03:49 -0700 (PDT) Received: from localhost ([133.11.172.102]) (authenticated bits=0) by mac.com (Xserve/smtpin07/MantshX 4.0) with ESMTP id j7G23j6k007983; Mon, 15 Aug 2005 19:03:48 -0700 (PDT) Date: Tue, 16 Aug 2005 11:03:43 +0900 (JST) Message-Id: <20050816.110343.59668738.chat95@mac.com> To: oberman@es.net From: NAKATA Maho In-Reply-To: <20050815180715.B8C8B5D08@ptavv.es.net> References: <20050812.111149.41688884.chat95@mac.com> <20050815180715.B8C8B5D08@ptavv.es.net> Organization: private X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Tue_Aug_16_11:03:43_2005_818)--" Content-Transfer-Encoding: 7bit Cc: freebsd-openoffice@freebsd.org Subject: Re: Unable to build openoffice-2.0-devel on current system 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: Tue, 16 Aug 2005 02:03:52 -0000 ----Next_Part(Tue_Aug_16_11:03:43_2005_818)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit In Message-ID: <20050815180715.B8C8B5D08@ptavv.es.net> Kevin Oberman wrote: > I just wanted to confirm that with the August 11 Python patch, I can > now build OpenOffice.org for -current! Yipee! I was getting really tired > of editing slides for my talks on another system and now I am back to > normal operations. python patch has already been committed. you need attached patch that against gcc-ooo/gcc32. no additional patches are needed AFAIK, atm. -- NAKATA, Maho (maho@FreeBSD.org) ----Next_Part(Tue_Aug_16_11:03:43_2005_818)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="gcc-ooo.freebsd-7.diff" Index: files/patch-freebsd-spec.h =================================================================== RCS file: /home/pcvs/ports/lang/gcc-ooo/files/patch-freebsd-spec.h,v retrieving revision 1.3 diff -u -r1.3 patch-freebsd-spec.h --- files/patch-freebsd-spec.h 8 Jan 2005 18:21:58 -0000 1.3 +++ files/patch-freebsd-spec.h 13 Aug 2005 10:59:39 -0000 @@ -1,6 +1,17 @@ ---- gcc/config/freebsd-spec.h.orig Tue Mar 2 14:34:55 2004 -+++ gcc/config/freebsd-spec.h Fri Dec 17 11:22:26 2004 -@@ -130,11 +130,19 @@ +--- 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 @@ + #define FBSD_TARGET_OS_CPP_BUILTINS() \ + do \ + { \ +- if (FBSD_MAJOR == 6) \ ++ if (FBSD_MAJOR == 7) \ ++ builtin_define ("__FreeBSD__=7"); \ ++ else if (FBSD_MAJOR == 6) \ + builtin_define ("__FreeBSD__=6"); \ + else if (FBSD_MAJOR == 5) \ + builtin_define ("__FreeBSD__=5"); \ +@@ -130,11 +132,19 @@ }" #else #if FBSD_MAJOR >= 5 --- /dev/null Sat Aug 13 19:59:10 2005 +++ files/patch-gcc+config.gcc Sat Aug 13 18:48:27 2005 @@ -0,0 +1,11 @@ +--- 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 @@ + 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" ;; + *) + echo 'Please update *-*-freebsd* in gcc/config.gcc' + exit 1 ----Next_Part(Tue_Aug_16_11:03:43_2005_818)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="gcc-32.freebsd-7.diff" --- /dev/null Sat Aug 13 19:55:00 2005 +++ files/patch-gcc+config+freebsd-spec.h Sat Aug 13 18:40:54 2005 @@ -0,0 +1,14 @@ +--- gcc/config/freebsd-spec.h.org Sat Aug 13 10:18:00 2005 ++++ gcc/config/freebsd-spec.h Sat Aug 13 18:40:03 2005 +@@ -48,6 +48,11 @@ + || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \ + || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker")) + ++#if FBSD_MAJOR == 7 ++#define FBSD_CPP_PREDEFINES \ ++ "-D__FreeBSD__=7 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" ++#endif ++ + #if FBSD_MAJOR == 6 + #define FBSD_CPP_PREDEFINES \ + "-D__FreeBSD__=6 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" --- /dev/null Sat Aug 13 19:55:00 2005 +++ files/patch-gcc+config+freebsd7.h Sat Aug 13 10:16:28 2005 @@ -0,0 +1,26 @@ +--- /dev/null Sat Aug 13 10:11:00 2005 ++++ gcc/config/freebsd7.h Sat Aug 13 10:11:42 2005 +@@ -0,0 +1,23 @@ ++/* FreeBSD version number setting for FreeBSD 6.x systems. ++ Copyright (C) 2001 Free Software Foundation, Inc. ++ Contributed by David E. O'Brien and BSDi. ++ ++This file is part of GNU CC. ++ ++GNU CC is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 2, or (at your option) ++any later version. ++ ++GNU CC is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with GNU CC; see the file COPYING. If not, write to ++the Free Software Foundation, 59 Temple Place - Suite 330, ++Boston, MA 02111-1307, USA. */ ++ ++#define FBSD_MAJOR 7 ++ --- /dev/null Sat Aug 13 19:55:00 2005 +++ files/patch-gcc+config.gcc Sat Aug 13 10:16:15 2005 @@ -0,0 +1,10 @@ +--- gcc/config.gcc.org Sat Mar 1 03:38:19 2003 ++++ gcc/config.gcc Sat Aug 13 10:11:06 2005 +@@ -445,6 +445,7 @@ + *-*-freebsd4 | *-*-freebsd[4].*) fbsd_tm_file="freebsd4.h";; + *-*-freebsd5 | *-*-freebsd[5].*) fbsd_tm_file="freebsd5.h";; + *-*-freebsd6 | *-*-freebsd[6].*) fbsd_tm_file="freebsd6.h";; ++ *-*-freebsd7 | *-*-freebsd[7].*) fbsd_tm_file="freebsd7.h";; + *) echo 'Please update *-*-freebsd* in gcc/config.gcc'; exit 1;; + esac + tmake_file="t-slibgcc-elf-ver t-freebsd" ----Next_Part(Tue_Aug_16_11:03:43_2005_818)----