GNOME.org
 

ooo-build r12348 - in trunk: . bin patches/dev300

Author: kyoshida
Date: Sun Apr 27 18:09:50 2008
New Revision: 12348
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12348&view=rev

Log:
2008-04-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/system-lpsolve-config_office.diff,
	* patches/dev300/system-lpsolve-sccomp.diff,
	* patches/dev300/system-lpsolve-scp2.diff: system-lpsolve bits for 
	dev300 (backported from cmcfixes43).
	
	* bin/unpack: removed lines that were commented out.
	
	* patches/dev300/apply: apply the above three patches.


Added:
   trunk/patches/dev300/system-lpsolve-config_office.diff
   trunk/patches/dev300/system-lpsolve-sccomp.diff
   trunk/patches/dev300/system-lpsolve-scp2.diff
Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/patches/dev300/apply

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Sun Apr 27 18:09:50 2008
@@ -473,8 +473,3 @@
 $GNUCP -f $TOOLSDIR/src/icons/*.png $OOBUILDDIR/default_images/res/commandimagelist/ || exit 1
 $GNUCP -f $TOOLSDIR/src/icons/tango/*.png $OOBUILDDIR/ooo_custom_images/tango/res/commandimagelist/ || exit 1
 
-#echo "Copying scsolver directory into the tree"
-#$GNUCP -Rf $TOOLSDIR/scratch/scsolver $OOBUILDDIR/ || exit 1
-
-#echo "Copying lpsolve directory into the tree"
-#$GNUCP -Rf $TOOLSDIR/scratch/lpsolve $OOBUILDDIR/ || exit 1

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Apr 27 18:09:50 2008
@@ -1139,6 +1139,11 @@
 # use getopt() and readdir_r() from system glibc
 #FIXME src680: system-libc.diff, i#69033, rengelha
 
+# add configure option for system lpsolve.
+system-lpsolve-config_office.diff
+system-lpsolve-scp2.diff
+system-lpsolve-sccomp.diff
+
 
 [ Icons ]
 # Make insensitive toolbar icons look far nicer

Added: trunk/patches/dev300/system-lpsolve-config_office.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/system-lpsolve-config_office.diff	Sun Apr 27 18:09:50 2008
@@ -0,0 +1,62 @@
+Index: config_office/configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.252
+retrieving revision 1.249.12.6
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.252 -r1.249.12.6
+--- config_office/configure.in	7 Mar 2008 16:56:35 -0000	1.252
++++ config_office/configure.in	25 Mar 2008 11:59:49 -0000	1.249.12.6
+@@ -443,8 +449,11 @@
+ AC_ARG_WITH(system-altlinuxhyph,
+ [  --with-system-altlinuxhyph    Use ALTLinuxhyph already on system
+ ],,)
++AC_ARG_WITH(system-lpsolve,
++[  --with-system-lpsolve         Use lpsolve already on system
++],,)
+ AC_ARG_WITH(system-mozilla,
+ [  --with-system-mozilla   Use mozilla already on system. Note that some
+                           components cannot be built against a contemporary
+                           mozilla. The flavour used can be specified by
+                           --with-system-mozilla=<flavour>. Supported are:
+@@ -4372,6 +4413,25 @@
+ fi
+ AC_SUBST(SYSTEM_MYTHES)
+ 
++dnl ===================================================================
++dnl Checking for lpsolve
++dnl ===================================================================
++AC_MSG_CHECKING([which lpsolve to use])
++if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
++	test "$with_system_lpsolve" != "no"; then
++    AC_MSG_RESULT([external])
++    SYSTEM_LPSOLVE=YES
++    AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
++       [ AC_MSG_ERROR(lpsolve headers not found.)], [])
++    AC_CHECK_LIB(lpsolve55, make_lp, ,
++        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
++else
++    AC_MSG_RESULT([internal])
++    SYSTEM_LPSOLVE=NO
++    BUILD_TYPE="$BUILD_TYPE LPSOLVE"
++fi
++AC_SUBST(SYSTEM_LPSOLVE)
++
+ dnl ***************************************
+ dnl testing libc version for Linux...
+ dnl ***************************************
+Index: config_office/set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.178
+retrieving revision 1.174.6.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.178 -r1.174.6.2
+--- config_office/set_soenv.in	7 Mar 2008 16:56:50 -0000	1.178
++++ config_office/set_soenv.in	12 Mar 2008 10:59:06 -0000	1.174.6.2
+@@ -1980,6 +1980,7 @@
+ ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
+ ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
+ ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
++ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",   "e" );
+ ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
+ ToFile( "HYPHEN_LIB",        "@HYPHEN_LIB@",       "e" );
+ ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );

Added: trunk/patches/dev300/system-lpsolve-sccomp.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/system-lpsolve-sccomp.diff	Sun Apr 27 18:09:50 2008
@@ -0,0 +1,14 @@
+Index: sccomp/prj/build.lst
+===================================================================
+RCS file: /cvs/sc/sccomp/prj/build.lst,v
+retrieving revision 1.2
+retrieving revision 1.2.2.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.2 -r1.2.2.1
+--- sccomp/prj/build.lst	6 Mar 2008 12:47:22 -0000	1.2
++++ sccomp/prj/build.lst	12 Mar 2008 15:36:07 -0000	1.2.2.1
+@@ -1,4 +1,4 @@
+-scc	sccomp	:	offuh comphelper lpsolve tools transex3 rsc NULL
++scc	sccomp	:	offuh comphelper LPSOLVE:lpsolve tools transex3 rsc NULL
+ scc	sccomp									usr1	-	all	scc_mkout NULL
+ scc	sccomp\prj								get		-	all	scc_prj NULL
+ scc	sccomp\source\solver					nmake	-	all	scc_solver NULL

Added: trunk/patches/dev300/system-lpsolve-scp2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/system-lpsolve-scp2.diff	Sun Apr 27 18:09:50 2008
@@ -0,0 +1,40 @@
+Index: scp2/source/calc/file_calc.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/calc/file_calc.scp,v
+retrieving revision 1.38
+retrieving revision 1.38.42.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.38 -r1.38.42.1
+--- scp2/source/calc/file_calc.scp	5 Feb 2008 15:51:55 -0000	1.38
++++ scp2/source/calc/file_calc.scp	10 Mar 2008 12:19:09 -0000	1.38.42.1
+@@ -37,10 +37,12 @@
+ 
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Solver, solver)
+ 
++#ifndef SYSTEM_LPSOLVE
+ File gid_File_Lib_Lpsolve
+     Name = SPECIAL_NAME(lpsolve55);
+     PACKED_LIB_FILE_BODY_PATCH;
+ End
++#endif
+ 
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Analysis, analysis)
+ 
+Index: scp2/source/calc/makefile.mk
+===================================================================
+RCS file: /cvs/installation/scp2/source/calc/makefile.mk,v
+retrieving revision 1.6
+retrieving revision 1.6.1008.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.6 -r1.6.1008.1
+--- scp2/source/calc/makefile.mk	9 Sep 2005 01:21:34 -0000	1.6
++++ scp2/source/calc/makefile.mk	10 Mar 2008 12:19:09 -0000	1.6.1008.1
+@@ -49,6 +49,10 @@
+ SCPDEFS+=-DWITHOUT_BINFILTER
+ .ENDIF
+ 
++.IF "$(SYSTEM_LPSOLVE)" == "YES"
++SCPDEFS+=-DSYSTEM_LPSOLVE
++.ENDIF
++
+ SCP_PRODUCT_TYPE=osl
+ PARFILES= \
+         module_calc.par              \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]