openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1409530 - in /incubator/ooo/branches/gbuild/main/basebmp: CppunitTest_basebmp.mk Library_basebmp.mk Module_basebmp.mk
Date Wed, 14 Nov 2012 23:08:11 GMT
Author: arist
Date: Wed Nov 14 23:08:10 2012
New Revision: 1409530

URL: http://svn.apache.org/viewvc?rev=1409530&view=rev
Log:
gnumake4_033_3754657d8ff7.patch
# HG changeset patch
# User Michael Stahl <mst@openoffice.org>
# Date 1300111755 -3600
# Node ID 3754657d8ff7fa1b1f09eeac630d4237d4ad73c1
# Parent  ab8134c0d177213c632cd88dc2da767190f815c5
gnumake4: basebmp: add necessary workarounds for SunCC


Modified:
    incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk
    incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk
    incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk

Modified: incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk?rev=1409530&r1=1409529&r2=1409530&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk (original)
+++ incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk Wed Nov 14 23:08:10
2012
@@ -39,16 +39,6 @@ $(eval $(call gb_CppunitTest_add_excepti
 	basebmp/test/tools \
 ))
 
-# TODO
-# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
-# if compiled with default -xalias_level (and optimization level -xO3)
-#.IF "$(OS)"=="SOLARIS"
-# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
-#.IF "$(CCNUMVER)"!="00050005"
-#CDEFS+=-xalias_level=compatible
-#.ENDIF
-#.ENDIF
-
 $(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \
 	basebmp \
 	sal \

Modified: incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk?rev=1409530&r1=1409529&r2=1409530&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk (original)
+++ incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk Wed Nov 14 23:08:10 2012
@@ -45,8 +45,6 @@ $(eval $(call gb_Library_set_defs,basebm
 	-DBASEBMP_DLLIMPLEMENTATION \
 ))
 
-# add libraries to be linked to basebmp; again these names need to be given as
-# specified in Repository.mk
 $(eval $(call gb_Library_add_linked_libs,basebmp,\
     sal \
     basegfx \
@@ -54,12 +52,19 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
-# add all source files that shall be compiled with exceptions enabled
-# the name is relative to $(SRCROOT) and must not contain an extension
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_cxxobjects,basebmp, \
+	basebmp/source/bitmapdevice \
+	basebmp/source/debug \
+	basebmp/source/polypolygonrenderer \
+    , $(gb_COMPILEROPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) -xalias_level=compatible \
+))
+else
 $(eval $(call gb_Library_add_exception_objects,basebmp,\
 	basebmp/source/bitmapdevice \
 	basebmp/source/debug \
 	basebmp/source/polypolygonrenderer \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk?rev=1409530&r1=1409529&r2=1409530&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk (original)
+++ incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk Wed Nov 14 23:08:10 2012
@@ -38,5 +38,4 @@ $(eval $(call gb_Module_add_check_target
 ))
 endif
 
-
 # vim: set noet sw=4 ts=4:



Mime
View raw message