incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1201396 - in /incubator/ooo/trunk/main/solenv: config/sooo340.ini gbuild/platform/freebsd.mk
Date Sun, 13 Nov 2011 02:40:46 GMT
Author: pfg
Date: Sun Nov 13 02:40:45 2011
New Revision: 1201396

URL: http://svn.apache.org/viewvc?rev=1201396&view=rev
Log:
FreeBSD: small configuration updates.

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

Modified: incubator/ooo/trunk/main/solenv/config/sooo340.ini
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/config/sooo340.ini?rev=1201396&r1=1201395&r2=1201396&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/config/sooo340.ini (original)
+++ incubator/ooo/trunk/main/solenv/config/sooo340.ini Sun Nov 13 02:40:45 2011
@@ -361,7 +361,7 @@ unxfbsdi
             MKOUT perl %SOLARENV%/bin/mkout.pl
             PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
             SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
-            SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib
 -L%SOLAR_STLLIBPATH%
+            SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/local/lib -L%SYSBASE%/usr/lib -L/usr/local/lib
 -L%SOLAR_STLLIBPATH%
             SOLAR_JAVA TRUE
             ZIPDEP perl %SOLARENV%/bin/zipdep.pl
             ENABLE_GCONF YES

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=1201396&r1=1201395&r2=1201396&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk Sun Nov 13 02:40:45 2011
@@ -108,8 +108,9 @@ gb_CXXFLAGS_WERROR := -Werror
 endif
 
 ifneq ($(strip $(SYSBASE)),)
-#gb_CXXFLAGS += --sysroot=$(SYSBASE)
-#gb_CFLAGS += --sysroot=$(SYSBASE)
+gb_CXXFLAGS += --sysroot=$(SYSBASE)
+gb_CFLAGS += --sysroot=$(SYSBASE)
+gb_LinkTarget_LDFLAGS := -Wl,--sysroot=$(SYSBASE)
 endif
 gb_LinkTarget_EXCEPTIONFLAGS := \
 	-DEXCEPTIONS_ON \
@@ -120,8 +121,8 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-DEXCEPTIONS_OFF \
 	-fno-exceptions \
 
-gb_LinkTarget_LDFLAGS := \
-	-Wl,-rpath-link=$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib:$(SYSBASE)/usr/local/lib
\
+gb_LinkTarget_LDFLAGS += \
+	-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
 	-Wl,-z,combreloc \
 	-Wl,-z,defs \
 	$(subst -L../lib , ,$(SOLARLIB)) \
@@ -305,8 +306,8 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
 
 define gb_Library_get_rpath
--Wl,-z,origin -Wl,-rpath,'$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))'
\
--Wl,-rpath-link,'$(gb_Library_OUTDIRLOCATION)'
+'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))'
\
+'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
 endef
 
 define gb_Library_Library_platform



Mime
View raw message