incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1202241 - in /incubator/ooo/trunk/main/solenv: config/sooo340.ini inc/unxfbsd.mk
Date Tue, 15 Nov 2011 15:28:46 GMT
Author: pfg
Date: Tue Nov 15 15:28:45 2011
New Revision: 1202241

URL: http://svn.apache.org/viewvc?rev=1202241&view=rev
Log:
i104014: FreeBSD port - build cleanups

Modified:
    incubator/ooo/trunk/main/solenv/config/sooo340.ini
    incubator/ooo/trunk/main/solenv/inc/unxfbsd.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=1202241&r1=1202240&r2=1202241&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/config/sooo340.ini (original)
+++ incubator/ooo/trunk/main/solenv/config/sooo340.ini Tue Nov 15 15:28:45 2011
@@ -23,7 +23,7 @@ common
             ENABLE_MYSQLC YES
             ENABLE_NSS_MODULE YES
             ENABLE_RANDR TRUE
-            ENABLE_REPORTBUILDER YES
+            ENABLE_REPORTBUILDER NO
             ENABLE_SVCTAGS YES
             ISERVER iserver.germany.sun.com
             LU_HGFLAG ""
@@ -32,7 +32,7 @@ common
             NEW_JAR_PACK TRUE
             NO_REC_RES TRUE
             OOODMAKEMODE YES
-            OOO_SHELL /bin/bash
+            OOO_SHELL bash
             PCLEAN_PATH xxx
             RES_ENUS TRUE
             RES_GER TRUE
@@ -357,21 +357,29 @@ unxfbsdi
             COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
             DELIVER perl %SOLARENV%/bin/deliver.pl
             DMAKEROOT %SOLARENV%/inc/startup
-            LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
+	    HAVE_GCC_VISIBILITY_FEATURE TRUE
+	    HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
+	    HAVE_LD_HASH_STYLE TRUE
+            LIBRARY_PATH %SYSBASE%/usr/lib:%SYSBASE%/usr/local/lib
             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
+            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/local/bin
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/local/include
             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
-            ENABLE_GNOMEVFS YES
+            ENABLE_GCONF TRUE
+            ENABLE_GNOMEVFS TRUE
+	    GNUCOPY gcp
+            GNUMAKE gmake
+            SYSTEM_LIBRSVG YES
+            SYSTEM_LIBCROCO YES
             SYSTEM_GDKPIXBUF YES
             SYSTEM_GLIB YES
             SYSTEM_GETTEXT YES
             SYSTEM_PANGO YES
             SYSTEM_LIBPNG YES
             SYSTEM_LIBJPEG YES
+            SYSTEM_LIBGSF YES
         }
         common0
         {
@@ -397,13 +405,15 @@ unxfbsdi
         }
         common2
         {
+            ENABLE_GRAPHITE TRUE
+            ENABLE_GSTREAMER TRUE
             BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
             COM GCC
             COMMON_BUILD_TOOLS %SOLARROOT%$/btools
             COMMON_ENV_TOOLS %SOLARROOT%$/etools
             CPU I
             CPUNAME INTEL
-            CVER C300
+            CVER C421
             ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
             GUI UNX
             GUIBASE unx
@@ -420,15 +430,15 @@ unxfbsdi
             SYSBASE %SOLAR_SYSBASE_ROOT%
             TEMP /tmp
             TMP /tmp
+            GTK_CFLAGS -I%SOLAR_SYSBASE_ROOT%/usr/local/include/gtk-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/local/lib/gtk-2.0/include
-I%SOLAR_SYSBASE_ROOT%/usr/include/atk-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/local/include/cairo
-I%SOLAR_SYSBASE_ROOT%/usr/local/include/pango-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/local/include/glib-2.0
-I%SOLAR_SYSBASE_ROOT%/usr/local/lib/glib-2.0/include
+            GTK_LIBS -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0
-lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
+            KDE_CFLAGS -I%KDE_ROOT%/include -DQT_CLEAN_NAMESPACE
+            KDE_LIBS -L%KDE_ROOT%/lib -lkdeui -lkdecore -lqt-mt
         }
         compath
         {
             COMPATH %STAR_COMPATH%
         }
-        debug
-        {
-            LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-        }
         distroot:0 if X%DIST_ROOT%X != XX
         {
             SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%

Modified: incubator/ooo/trunk/main/solenv/inc/unxfbsd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/unxfbsd.mk?rev=1202241&r1=1202240&r2=1202241&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/unxfbsd.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/unxfbsd.mk Tue Nov 15 15:28:45 2011
@@ -137,12 +137,12 @@ LINKC*=$(CC)
 
 # default linker flags
 LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)



Mime
View raw message