Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 884EB9FBA for ; Sun, 9 Oct 2011 02:59:59 +0000 (UTC) Received: (qmail 52792 invoked by uid 500); 9 Oct 2011 02:59:59 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 52736 invoked by uid 500); 9 Oct 2011 02:59:58 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 52729 invoked by uid 99); 9 Oct 2011 02:59:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Oct 2011 02:59:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Oct 2011 02:59:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C6644238897D; Sun, 9 Oct 2011 02:59:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1180532 - in /incubator/ooo/trunk/main: external/gcc3_specific/makefile.mk scp2/source/ooo/ure.scp Date: Sun, 09 Oct 2011 02:59:36 -0000 To: ooo-commits@incubator.apache.org From: pfg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111009025936.C6644238897D@eris.apache.org> Author: pfg Date: Sun Oct 9 02:59:36 2011 New Revision: 1180532 URL: http://svn.apache.org/viewvc?rev=1180532&view=rev Log: i85027 - FreeBSD port: include libgcc_s and libstdc++ in the installation set. Modified: incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk incubator/ooo/trunk/main/scp2/source/ooo/ure.scp Modified: incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk?rev=1180532&r1=1180531&r2=1180532&view=diff ============================================================================== --- incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk (original) +++ incubator/ooo/trunk/main/external/gcc3_specific/makefile.mk Sun Oct 9 02:59:36 2011 @@ -43,7 +43,6 @@ $(MINGWGXXDLL) : .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3" .IF "$(OS)"!="MACOSX" -.IF "$(OS)"!="FREEBSD" .EXPORT : CC @@ -60,8 +59,6 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) : .ENDIF .ENDIF - -.ENDIF .ENDIF # "$(BUILD_SPECIAL)"=="" Modified: incubator/ooo/trunk/main/scp2/source/ooo/ure.scp URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/ure.scp?rev=1180532&r1=1180531&r2=1180532&view=diff ============================================================================== --- incubator/ooo/trunk/main/scp2/source/ooo/ure.scp (original) +++ incubator/ooo/trunk/main/scp2/source/ooo/ure.scp Sun Oct 9 02:59:36 2011 @@ -855,7 +855,7 @@ File gid_File_Dl_Stlport End #endif -#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \ +#if defined _gcc3 && !(defined NETBSD \ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT)) File gid_File_Dl_GccS TXT_FILE_BODY; @@ -866,7 +866,7 @@ File gid_File_Dl_GccS End #endif -#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \ +#if defined _gcc3 && !(defined NETBSD \ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT)) File gid_File_Dl_Stdcpp Dir = SCP2_URE_DL_DIR;