ooo-build r11236 - in trunk: . bin distro-configs patches/src680

[strba svn gnome org]

Author: strba
Date: Thu Jan 10 09:37:27 2008
New Revision: 11236
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11236&view=rev

Log:
miscellaneous solaris bits (see the changelog with the same revision number)

Added:
   trunk/patches/src680/solaris-dont-depend-on-core10.diff
Modified:
   trunk/ChangeLog
   trunk/bin/build-ooo
   trunk/distro-configs/Solaris.conf.in
   trunk/patches/src680/apply

Modified: trunk/bin/build-ooo
==============================================================================
--- trunk/bin/build-ooo	(original)
+++ trunk/bin/build-ooo	Thu Jan 10 09:37:27 2008
@@ -5,7 +5,7 @@
 #
 . ./setup
 
-if test "z$BUILD_WIN32" = "z"; then
+if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS"; then
     if ! test -f /proc/cpuinfo; then
         echo "Looks like proc isn't mounted - this means almost certain"
         echo "Java related weird build failure: please check /proc"
@@ -13,6 +13,12 @@
     fi
 fi
 
+if test "z`uname -s`" == "zSunOS"; then
+    if test -f /usr/sfw/bin/gtar; then
+    	(cd $OOOBUILDDIR/solenv/bin && ln -s /usr/sfw/bin/gtar tar)
+    fi
+fi
+
 # configure
 
 #  main configure

Modified: trunk/distro-configs/Solaris.conf.in
==============================================================================
--- trunk/distro-configs/Solaris.conf.in	(original)
+++ trunk/distro-configs/Solaris.conf.in	Thu Jan 10 09:37:27 2008
@@ -36,5 +36,8 @@
 --with-ant-home=/opt/apache-ant-1.7.0/
 --with-jdk-home=/usr/jdk/jdk1.5.0_12
 --disable-scsolver
+--without-system-neon
+--without-system-openssl
+--without-unix-wrapper
 --enable-opengl
 --enable-ogltrans

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Jan 10 09:37:27 2008
@@ -1837,6 +1837,7 @@
 svx-sdrobjeditview-update-edit-area.diff, n#305205, rodo
 cairocanvas-image-borders.diff, n#340142, rodo
 goodies-eps-filter-unix.diff, n#200053, rodo
+solaris-dont-depend-on-core10.diff, fridrich
 
 [ EMFPlus ]
 emf+-canvas.diff

Added: trunk/patches/src680/solaris-dont-depend-on-core10.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/solaris-dont-depend-on-core10.diff	Thu Jan 10 09:37:27 2008
@@ -0,0 +1,67 @@
+--- setup_native/source/packinfo/packinfo_office.txt	Thu Jan 10 10:16:35 2008
++++ setup_native/source/packinfo/packinfo_office.txt	Thu Jan 10 10:18:05 2008
+@@ -66,7 +66,7 @@
+ module = "gid_Module_Prg_Wrt"
+ script = "shellscripts_module.txt"
+ solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-writer"
+-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09,%WITHOUTDOTUNIXPRODUCTNAME-core10"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ packagename = "%UNIXPRODUCTNAME-writer"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-writer"
+ freebsdrequires = "%UNIXPRODUCTNAME-core01"
+@@ -82,7 +82,7 @@
+ module = "gid_Module_Prg_Calc"
+ script = "shellscripts_module.txt"
+ solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-calc"
+-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09,%WITHOUTDOTUNIXPRODUCTNAME-core10"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ packagename = "%UNIXPRODUCTNAME-calc"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-calc"
+ freebsdrequires = "%UNIXPRODUCTNAME-core01"
+@@ -98,7 +98,7 @@
+ module = "gid_Module_Prg_Draw"
+ script = "shellscripts_module.txt"
+ solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-draw"
+-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09,%WITHOUTDOTUNIXPRODUCTNAME-core10"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ packagename = "%UNIXPRODUCTNAME-draw"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-draw"
+ freebsdrequires = "%UNIXPRODUCTNAME-core01"
+@@ -114,7 +114,7 @@
+ module = "gid_Module_Prg_Impress"
+ script = "shellscripts_module.txt"
+ solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-impress"
+-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09,%WITHOUTDOTUNIXPRODUCTNAME-core10"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ packagename = "%UNIXPRODUCTNAME-impress"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-impress"
+ freebsdrequires = "%UNIXPRODUCTNAME-core01"
+@@ -130,7 +130,7 @@
+ module = "gid_Module_Prg_Base"
+ script = "shellscripts_module.txt"
+ solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-base"
+-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09,%WITHOUTDOTUNIXPRODUCTNAME-core10"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ packagename = "%UNIXPRODUCTNAME-base"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-base"
+ freebsdrequires = "%UNIXPRODUCTNAME-core01"
+@@ -146,7 +146,7 @@
+ module = "gid_Module_Prg_Math"
+ script = "shellscripts_module.txt"
+ solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-math"
+-solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09,%WITHOUTDOTUNIXPRODUCTNAME-core10"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ packagename = "%UNIXPRODUCTNAME-math"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-math"
+ freebsdrequires = "%UNIXPRODUCTNAME-core01"
+--- scp2/source/calc/module_calc.scp	Thu Jan 10 10:21:39 2008
++++ scp2/source/calc/module_calc.scp	Thu Jan 10 10:22:08 2008
+@@ -42,7 +42,7 @@
+     Sortkey = "200";
+ 	Script = "shellscripts_module.txt"
+ 	Solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-calc"
+-	Solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09,%WITHOUTDOTUNIXPRODUCTNAME-core10"
++	Solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01,%WITHOUTDOTUNIXPRODUCTNAME-core02,%WITHOUTDOTUNIXPRODUCTNAME-core03,%WITHOUTDOTUNIXPRODUCTNAME-core04,%WITHOUTDOTUNIXPRODUCTNAME-core05,%WITHOUTDOTUNIXPRODUCTNAME-core06,%WITHOUTDOTUNIXPRODUCTNAME-core07,%WITHOUTDOTUNIXPRODUCTNAME-core08,%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ 	Packagename = "%UNIXPRODUCTNAME-calc"
+ 	Linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-calc"
+ 	Freebsdrequires = "%UNIXPRODUCTNAME-core01"