ooo-build r11336 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Mon Jan 21 11:31:56 2008
New Revision: 11336
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11336&view=rev

Log:
adding two fake distributions - System and Sdk - for patches that are applied only if the *-system.tar.bz2 and/or *-sdk_oo.tar.bz2 tarballs are unpacked

Modified:
   trunk/ChangeLog
   trunk/Makefile.shared
   trunk/patches/src680/apply

Modified: trunk/Makefile.shared
==============================================================================
--- trunk/Makefile.shared	(original)
+++ trunk/Makefile.shared	Mon Jan 21 11:31:56 2008
@@ -16,6 +16,12 @@
 		if test -d $(OOBUILDDIR)/binfilter ; then \
 			FLAGS="$$FLAGS --distro=Binfilter"; \
 		fi ; \
+		if test -d $(OOBUILDDIR)/zlib; then \
+		    FLAGS="$$FLAGS --distro=System"; \
+		fi ; \
+		if test -d $(OOBUILDDIR)/sdk_oo ; then \
+			FLAGS="$$FLAGS --distro=Sdk"; \
+		fi ; \
 		if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \
 			FLAGS="$$FLAGS --distro=Localize"; \
 		fi ; \
@@ -70,6 +76,12 @@
 	if test -d $(OOBUILDDIR)/binfilter ; then \
 		FLAGS="$$FLAGS --distro=Binfilter"; \
 	fi ; \
+    if test -d $(OOBUILDDIR)/zlib; then \
+        FLAGS="$$FLAGS --distro=System"; \
+    fi ; \
+	if test -d $(OOBUILDDIR)/sdk_oo ; then \
+		FLAGS="$$FLAGS --distro=Sdk"; \
+	fi ; \
 	if test $(OOO_LANGS) != en-US ; then \
 		FLAGS="$$FLAGS --distro=Localize"; \
 	fi ; \
@@ -85,6 +97,12 @@
 	if test -d $(OOBUILDDIR)/binfilter ; then \
 		FLAGS="$$FLAGS --distro=Binfilter"; \
 	fi ; \
+	if test -d $(OOBUILDDIR)/zlib ; then \
+		FLAGS="$$FLAGS --distro=System"; \
+	fi ; \
+	if test -d $(OOBUILDDIR)/sdk_oo ; then \
+		FLAGS="$$FLAGS --distro=Sdk"; \
+	fi ; \
 	if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \
 		FLAGS="$$FLAGS --distro=Localize"; \
 	fi ; \

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Jan 21 11:31:56 2008
@@ -31,8 +31,12 @@
 	      SVGImport
 # Binfilter patches: a special distro; applied only when building with binfilter
 Binfilter : BFBuildBits, BFFixes
+# System patches: a special distro; applied only when building with the system tarball unpacked
+System : SystemBuildBits
+# Sdk patches: a special distro; applied only when building with the sdk tarball unpacked
+Sdk :
 #Localize
-Localize  : 
+Localize : 
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, CalcSolver, Split, Shrink, \
@@ -1039,17 +1043,22 @@
 # fixes warnings about that a variable is used unitialized
 warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
 
-# disabled on Fridrich's request. He will find a proper solution one day.
-# moz-solaris11-makefiles.diff, fridrich
+#fix a build issue on solaris with sunpro 5.9 aka Sun Studio 12
+stlport-solaris-fileno.diff, fridrich
 
 [ BFBuildBits ]
 SectionOwner => pmladek
 
 # STLport fixes
 binfilter-stl.diff, i#63770, hmth
-stlport-solaris-fileno.diff, fridrich
 #FIXME ooh680: gcc-4.3-binfilter.diff, i#83276, pmladek
 
+[ SystemBuildBits ]
+SectionOwner => fridrich
+
+# Mozilla build-bits to not break on Solaris 11
+moz-solaris11-makefiles.diff, fridrich
+
 [ VCL ]
 
 # Don't let the splash screen take over