[Libreoffice-commits] .: 5 commits - odk/settings

[Petr Mladek]

 odk/settings/settings.mk |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 5b33ac0c39e661bdd9373fe44d702d6c8e31f230
Merge: f6f48c3... 27da27c...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 6 19:25:25 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-4'

commit 27da27c6396b7b6c8599ce72b3d6ed53c0e7b501
Merge: d0ee00c... f779dac...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 5 19:08:20 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
    
    Conflicts:
    	odk/settings/settings.mk

diff --cc odk/settings/settings.mk
index e4fc05a,3d67ee5..bbd18ee
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@@ -568,6 -569,15 +570,10 @@@ CPPUHELPERLIB=-luno_cppuhelper$(COMID
  SALHELPERLIB=-luno_salhelper$(COMID)
  REGLIB=-lreg
  STORELIB=-lstore
+ ifeq "$(STLPORT)" "yes"
 -ifeq "$(STLPORT_VER)" "500"
 -STLPORTLIB=-lstlport
 -else
 -STLPORTLIB=-lstlport_gcc$(STLDEBUG)
+ endif
+ else
+ STLPORTLIB=
 -endif
  
  EMPTYSTRING=
  PATH_SEPARATOR=:
commit d0ee00c0419c281131dd2c47b908c20cd0dd529a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 1 15:13:16 2011 +0200

    Branch libreoffice-3-4
    
    This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases
    
        + only bug fixes are allowed
        + no approval needed during beta phase (two weeks after branch)
        + 1 approval needed during rc phase and for bugfix releases
        + 2 approvals with different/no affiliation needed for late features
        + regularly merged into master by a selected person when living
    
    Please watch http://wiki.documentfoundation.org/ReleasePlan
    and read announces on libreoffice at lists.freedesktop.org
    
    If you want to build something cool, unstable, and risky, use master.
commit f779dacc689b152f5ede60bc8bfc6029c2e77d68
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 8 15:31:14 2011 +0100

    Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)
commit 8cf803c664182e2aac245695fb3ddf36aac9b877
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Feb 11 22:42:48 2011 +0100

    fix ODK settings.mk to only set STLPORTLIB if needed
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 188ff88..3d67ee5 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -262,14 +262,12 @@ ifeq "$(PROCTYPE)" "powerpc"
 PACKAGE_LIB_DIR=linux_powerpc.plt
 UNOPKG_PLATFORM=Linux_PowerPC
 JAVA_PROC_TYPE=ppc
-STLPORT=yes
 endif
 
 ifeq "$(PROCTYPE)" "sparc"
 PACKAGE_LIB_DIR=linux_sparc.plt
 UNOPKG_PLATFORM=Linux_SPARC
 JAVA_PROC_TYPE=sparc
-STLPORT=yes
 endif
 
 ifeq "$(PROCTYPE)" "x86_64"
@@ -503,9 +501,11 @@ PLATFORM=kfreebsd
 ifeq "$(PROCTYPE)" "x86_64"
 PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
 UNOPKG_PLATFORM=kFreeBSD_x86_64
+STLPORT=no
 else
 PACKAGE_LIB_DIR=kfreebsd_x86.plt
 UNOPKG_PLATFORM=kFreeBSD_x86
+STLPORT=no
 endif
 else
 PLATFORM=freebsd
@@ -569,11 +569,15 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 SALHELPERLIB=-luno_salhelper$(COMID)
 REGLIB=-lreg
 STORELIB=-lstore
+ifeq "$(STLPORT)" "yes"
 ifeq "$(STLPORT_VER)" "500"
 STLPORTLIB=-lstlport
 else
 STLPORTLIB=-lstlport_gcc$(STLDEBUG)
 endif
+else
+STLPORTLIB=
+endif
 
 EMPTYSTRING=
 PATH_SEPARATOR=: