incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1198961 - /incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk
Date Mon, 07 Nov 2011 21:48:59 GMT
Author: pfg
Date: Mon Nov  7 21:48:58 2011
New Revision: 1198961

URL: http://svn.apache.org/viewvc?rev=1198961&view=rev
Log:
FreeBSD port: Merge some updates from the linux gbuild configuration. Special thanks to Ariel
Constenla-Haile for taking to time to help me solve the many bugs related to this.

Modified:
    incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk

Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk?rev=1198961&r1=1198960&r2=1198961&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk Mon Nov  7 21:48:58 2011
@@ -31,8 +31,8 @@ COM := GCC
 gb_MKTEMP := gmktemp -t gbuild.XXXXXX
 
 gb_CC := cc
-gb_CXX := g++
-gb_GCCP := gcc
+gb_CXX := c++
+gb_GCCP := cc
 gb_AR := ar
 gb_AWK := awk
 gb_CLASSPATHSEP := :
@@ -121,7 +121,7 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-fno-exceptions \
 
 gb_LinkTarget_LDFLAGS := \
-	-Wl,-rpath-link=$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
+	-Wl,-rpath-link=$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib:$(SYSBASE)/usr/local/lib
\
 	-Wl,-z,combreloc \
 	-Wl,-z,defs \
 	$(subst -L../lib , ,$(SOLARLIB)) \
@@ -261,19 +261,23 @@ gb_Library_STLEXT := port_gcc_stldebug$(
 endif
 
 ifeq ($(CPUNAME),X86_64)
-gb_Library_OOOEXT := fx$(gb_Library_PLAINEXT)
+gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
 else
-gb_Library_OOOEXT := fi$(gb_Library_PLAINEXT)
+gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
 endif
 
 gb_Library_PLAINLIBS_NONE += \
 	dl \
+  freetype \
 	jpeg \
 	m \
 	pthread \
 	X11 \
+  Xext \
+  SM \
+  ICE \
 	z
 
 gb_Library_FILENAMES := \



Mime
View raw message