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

[pmladek svn gnome org]

Author: pmladek
Date: Tue Jul  1 14:51:55 2008
New Revision: 13011
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13011&view=rev

Log:
2008-07-01  Petr Mladek  <pmladek suse cz>

	* patches/dev300/speed-symbolic-functions.diff: apply later
	  after AC_PROG_CC is called; the gcc detection was broken
	  otherwise
	* patches/dev300/ac-objext-hack.diff, patches/dev300/apply: bin;
	  is obsoleted by the above fix

	* bin/package-ooo: find and put pyunorc-update64 into the file list
	  again



Removed:
   trunk/patches/dev300/ac-objext-hack.diff
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/patches/dev300/apply
   trunk/patches/dev300/speed-symbolic-functions.diff

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Tue Jul  1 14:51:55 2008
@@ -528,8 +528,8 @@
 	%dir $OOINSTBASE/basis$VERSION/share/template/en-US/officorr
 	$OOINSTBASE/basis$VERSION/share/template/en-US/officorr/project-proposal.ott" > gid_Module_Root_Hack
 
-	test -f $OOINSTDIR/program/pyunorc-update64 && \
-		echo $OOINSTBASE/program/pyunorc-update64 >> gid_Module_Pyuno_Hack
+	test -f $OOINSTDIR/basis$VERSION/program/pyunorc-update64 && \
+		echo $OOINSTBASE/basis$VERSION/program/pyunorc-update64 >> gid_Module_Pyuno_Hack
 
 	rm -f common_list.txt
 	for module in gid_Module_Root gid_Module_Root_Brand \

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul  1 14:51:55 2008
@@ -251,9 +251,6 @@
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths.diff, i#90430, jholesov
 
-# no idea why that (sometimes?) does not get called anymore
-ac-objext-hack.diff
-
 [ CJK ]
 #set default CJK font fontsize as 10.5pt
 sw-default-cjk-fontsize.diff i#72010, jianhua

Modified: trunk/patches/dev300/speed-symbolic-functions.diff
==============================================================================
--- trunk/patches/dev300/speed-symbolic-functions.diff	(original)
+++ trunk/patches/dev300/speed-symbolic-functions.diff	Tue Jul  1 14:51:55 2008
@@ -1,9 +1,12 @@
 --- config_office/configure.in.old	2008-01-28 18:31:50.000000000 +0100
 +++ config_office/configure.in	2008-01-28 18:45:05.000000000 +0100
-@@ -1355,6 +1355,25 @@ if test "$GCC" = "yes"; then
- fi
- AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
+@@ -1570,6 +1551,29 @@ fi
+ AC_SUBST(HAVE_LD_HASH_STYLE)
  
+ dnl ===================================================================
++dnl  Check for -Bsymbolic-functions linker support
++dnl ===================================================================
++
 +HAVE_LD_BSYMBOLIC_FUNCTIONS=
 +if test "$GCC" = "yes"; then
 +   AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
@@ -23,9 +26,10 @@
 +fi
 +AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
 +
++dnl ===================================================================
+ dnl  Test the IRIX SGI Mips pro compiler
  dnl ===================================================================
- dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
- dnl ===================================================================
+ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
 --- config_office/set_soenv.in.old	2008-01-28 17:13:14.000000000 +0100
 +++ config_office/set_soenv.in	2008-01-28 18:47:05.000000000 +0100
 @@ -1924,6 +1924,8 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",