incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1235124 - in /incubator/ooo/trunk/main: icu/icu4c-4_0_1-src.patch sfx2/Module_sfx2.mk vcl/Library_vcl.mk
Date Tue, 24 Jan 2012 03:43:41 GMT
Author: pfg
Date: Tue Jan 24 03:43:40 2012
New Revision: 1235124

URL: http://svn.apache.org/viewvc?rev=1235124&view=rev
Log:
FreeBSD port: build fixes.

Modified:
    incubator/ooo/trunk/main/icu/icu4c-4_0_1-src.patch
    incubator/ooo/trunk/main/sfx2/Module_sfx2.mk
    incubator/ooo/trunk/main/vcl/Library_vcl.mk

Modified: incubator/ooo/trunk/main/icu/icu4c-4_0_1-src.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/icu/icu4c-4_0_1-src.patch?rev=1235124&r1=1235123&r2=1235124&view=diff
==============================================================================
--- incubator/ooo/trunk/main/icu/icu4c-4_0_1-src.patch (original)
+++ incubator/ooo/trunk/main/icu/icu4c-4_0_1-src.patch Tue Jan 24 03:43:40 2012
@@ -1,3 +1,23 @@
+--- misc/icu/source/config/mh-bsd-gcc	2009-01-15 16:46:10.000000000 +0900
++++ misc/build/icu/source/config/mh-bsd-gcc	2011-06-14 17:12:14.000000000 +0900
+@@ -18,7 +18,15 @@
+ 
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=	
+-LD_RPATH_PRE=	-Wl,-rpath,
++LD_RPATH_PRE=	-Wl,-z,origin -Wl,-rpath,
++
++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
++## (incl. the C++ runtime libs potentially found in the URE lib dir):
++ENABLE_RPATH=YES
++RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'
++
++#SH#  ENABLE_RPATH=YES
++#SH#  RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'"
+ 
+ ## Compiler switch to embed a library name
+ LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
+
 --- misc/icu/source/common/putil.c	2008-07-01 03:41:12.000000000 +0200
 +++ misc/build/icu/source/common/putil.c	2008-09-02 07:01:29.335795765 +0200
 @@ -52,7 +52,7 @@

Modified: incubator/ooo/trunk/main/sfx2/Module_sfx2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/Module_sfx2.mk?rev=1235124&r1=1235123&r2=1235124&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/Module_sfx2.mk (original)
+++ incubator/ooo/trunk/main/sfx2/Module_sfx2.mk Tue Jan 24 03:43:40 2012
@@ -41,7 +41,15 @@ $(eval $(call gb_Module_add_subsequentch
 	JunitTest_sfx2_unoapi \
 ))
 
-ifeq ($(OS),LINUX)
+ifeq ($(OS),FREEBSD)
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Module_add_targets,sfx2,\
+	Library_qstart \
+))
+endif
+endif
+
+ifeq ($(OS),Linux)
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
 $(eval $(call gb_Module_add_targets,sfx2,\
 	Library_qstart \

Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1235124&r1=1235123&r2=1235124&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Tue Jan 24 03:43:40 2012
@@ -41,11 +41,11 @@ $(eval $(call gb_Library_set_include,vcl
 	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
+    $$(FREETYPE_CFLAGS) \
 ))
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_set_cxxflags,vcl,\
     $$(CXXFLAGS) \
-    $$(FREETYPE_CFLAGS) \
 ))
 endif
 



Mime
View raw message