ooo-build r11207 - in trunk: . distro-configs patches/scsolver patches/src680

[strba svn gnome org]

Author: strba
Date: Mon Jan  7 13:20:21 2008
New Revision: 11207
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11207&view=rev

Log:
Add a silent possibility to disable the scsolver and default to that state for Solaris, since scsolver and lpsolve are  broken there

Modified:
   trunk/ChangeLog
   trunk/distro-configs/Solaris.conf.in
   trunk/patches/scsolver/scs-sc-build.diff
   trunk/patches/scsolver/scs-scp2.diff
   trunk/patches/src680/apply
   trunk/patches/src680/system-lpsolve-config_office.diff

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Mon Jan  7 13:20:21 2008
@@ -1,3 +1,13 @@
+2008-01-07  Fridrich Strba  <fridrich strba bluewin ch>
+
+	* patches/src680/system-lpsolve-config_office.diff,
+	  patches/scsolver/scs-sc-build.diff,
+	  patches/scsolver/scs-scp2.diff, patches/src680/apply: give a silent 
+	possibility to disable the building of scsolver and lpsolve (kohei agreed).
+	* distor-configs/Solaris.conf.in: default for the distro Solaris to
+	disabling the building of scsolver and lpsolve, since they are both broken
+	on Solaris.
+
 2008-01-07  Michael Meeks  <michael meeks novell com>
 
 	* download.in: allow ooh download.

Modified: trunk/distro-configs/Solaris.conf.in
==============================================================================
--- trunk/distro-configs/Solaris.conf.in	(original)
+++ trunk/distro-configs/Solaris.conf.in	Mon Jan  7 13:20:21 2008
@@ -35,3 +35,4 @@
 --disable-kde
 --with-ant-home=/opt/apache-ant-1.7.0/
 --with-jdk-home=/usr/jdk/jdk1.5.0_12
+--disable-scsolver

Modified: trunk/patches/scsolver/scs-sc-build.diff
==============================================================================
--- trunk/patches/scsolver/scs-sc-build.diff	(original)
+++ trunk/patches/scsolver/scs-sc-build.diff	Mon Jan  7 13:20:21 2008
@@ -7,7 +7,7 @@
 +++ sc/prj/build.lst	9 Jan 2006 15:23:50 -0000
 @@ -1,4 +1,4 @@
 -sc	sc	:	oovbaapi svx stoc uui BOOST:boost NULL
-+sc	sc	:	oovbaapi svx scsolver stoc uui BOOST:boost NULL
++sc	sc	:	oovbaapi svx SCSOLVER:scsolver stoc uui BOOST:boost NULL
  sc	sc										usr1	-	all	sc_mkout NULL
  sc	sc\inc									get		-	all	sc_inc NULL
  sc	sc\prj									get		-	all	sc_prj NULL

Modified: trunk/patches/scsolver/scs-scp2.diff
==============================================================================
--- trunk/patches/scsolver/scs-scp2.diff	(original)
+++ trunk/patches/scsolver/scs-scp2.diff	Mon Jan  7 13:20:21 2008
@@ -1,6 +1,6 @@
 --- scp2/source/calc/makefile.mk-old	2006-06-20 15:27:41.000000000 +0200
 +++ scp2/source/calc/makefile.mk	2006-06-20 15:27:52.000000000 +0200
-@@ -49,6 +49,10 @@
+@@ -49,6 +49,14 @@
  SCPDEFS+=-DWITHOUT_BINFILTER
  .ENDIF
  
@@ -8,6 +8,10 @@
 +SCPDEFS+=-DSYSTEM_LPSOLVE
 +.ENDIF
 +
++.IF "$(BUILD_SCSOLVER)" == "YES"
++SCPDEFS+=-DBUILD_SCSOLVER
++.ENDIF
++
  SCP_PRODUCT_TYPE=osl
  PARFILES= \
          module_calc.par              \
@@ -18,10 +22,12 @@
 diff -u -r1.29 file_calc.scp
 --- scp2/source/calc/file_calc.scp	26 Apr 2006 20:46:56 -0000	1.29
 +++ scp2/source/calc/file_calc.scp	1 Jul 2006 22:41:11 -0000
-@@ -35,6 +35,39 @@
+@@ -35,6 +35,43 @@
  
  #include "macros.inc"
  
++#ifdef BUILD_SCSOLVER
++
 +#ifndef SYSTEM_LPSOLVE
 +
 +#ifdef UNX
@@ -55,6 +61,8 @@
 +
 +STD_RES_FILE_PATCH( gid_File_Res_ScSolver, scsolver )
 +
++#endif
++
  STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Analysis, analysis)
  
  STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Jan  7 13:20:21 2008
@@ -700,7 +700,7 @@
 novell-palette.diff, michael
 
 # finally disable -fsigned-char on pcc
-solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
+#solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
 
 
 [ NotDebian ]
@@ -1811,7 +1811,7 @@
 [ Gcc43 ]
 # Make it compile with gcc 4.3
 #FIXME src680: gcc-4.3.diff, i#83276, brosenk
-gcc-4.3-2.diff, i#83276, pmladek
+#gcc-4.3-2.diff, i#83276, pmladek
 gcc-4.3-3.diff, i#83276, pmladek
 
 [ OxygenOfficePalettes ]

Modified: trunk/patches/src680/system-lpsolve-config_office.diff
==============================================================================
--- trunk/patches/src680/system-lpsolve-config_office.diff	(original)
+++ trunk/patches/src680/system-lpsolve-config_office.diff	Mon Jan  7 13:20:21 2008
@@ -1,10 +1,22 @@
 --- config_office/configure.in-old
 +++ config_office/configure.in
-@@ -3910,6 +3910,24 @@
+@@ -3910,6 +3910,39 @@
  fi
  AC_SUBST(SYSTEM_MYTHES)
 
 +dnl ===================================================================
++dnl Checking for calc solver
++dnl ===================================================================
++AC_MSG_CHECKING([whether to build calc solver])
++if test "$enable_scsolver" == "no"; then
++    AC_MSG_RESULT([no])
++    BUILD_SCSOLVER=NO
++else
++    AC_MSG_RESULT([yes])
++    BUILD_SCSOLVER=YES
++    BUILD_TYPE="$BUILD_TYPE SCSOLVER"
++
++dnl ===================================================================
 +dnl Checking for lpsolve
 +dnl ===================================================================
 +AC_MSG_CHECKING([which lpsolve to use])
@@ -22,17 +34,21 @@
 +fi
 +AC_SUBST(SYSTEM_LPSOLVE)
 +
++fi
++AC_SUBST(BUILD_SCSOLVER)
++
  dnl ***************************************
  dnl testing libc version for Linux...
  dnl ***************************************
 
 --- config_office/set_soenv.in-old	2006-06-20 13:58:26.000000000 +0200
 +++ config_office/set_soenv.in	2006-06-20 14:03:48.000000000 +0200
-@@ -1813,6 +1813,7 @@
+@@ -1813,6 +1813,8 @@
  ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
  ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
  ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
-+ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",  "e" );
++ToFile( "BUILD_SCSOLVER",    "@BUILD_SCSOLVER@",   "e" );
++ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",   "e" );
  ToFile( "PAM",               "@PAM@",              "e" );
  ToFile( "NEW_SHADOW_API",    "@NEW_SHADOW_API@",   "e" );
  ToFile( "PAM_LINK",          "@PAM_LINK@",         "e" );