dbaccess/Library_dbu.mk | 2 +- sc/Library_vbaobj.mk | 2 +- sd/Library_sd.mk | 27 +++------------------------ sfx2/Library_sfx.mk | 2 +- slideshow/Library_slideshow.mk | 12 +----------- svx/Library_svxcore.mk | 15 +-------------- 6 files changed, 8 insertions(+), 52 deletions(-)
New commits: commit d0a593d77133906b9541eee418cffbc222ae4ff4 Author: Michael Stahl <[email protected]> Date: Fri Aug 16 15:02:24 2013 +0200 pass gb_DEBUG_CFLAGS for the remaining NOOPT files Change-Id: I5d5f65766d4ad3b319b2cbe4f6491d0aab7f02df diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index fa7211b..996b7b2 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -271,7 +271,7 @@ endif ifeq ($(COM),GCC) $(eval $(call gb_Library_add_cxxobjects,dbu,\ dbaccess/source/ui/uno/copytablewizard \ - , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) \ + , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) $(if $(call gb_LinkTarget__debug_enabled,dbu),$(gb_DEBUG_CFLAGS)) \ )) else $(eval $(call gb_Library_add_exception_objects,dbu,\ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 5c98686..9146a11 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -123,7 +123,7 @@ endif ifeq ($(sc_gccthunkBroken),1) $(eval $(call gb_Library_add_cxxobjects,vbaobj,\ sc/source/ui/vba/vbasheetobjects \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ + , $(gb_COMPILERNOOPTFLAGS) $(if $(call gb_LinkTarget__debug_enabled,vbaobj),$(gb_DEBUG_CFLAGS)) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) else $(eval $(call gb_Library_add_exception_objects,vbaobj,\ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 2af7216..a95e2b7 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -293,7 +293,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_cxxobjects,sfx,\ sfx2/source/control/dispatch \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ + , $(gb_COMPILERNOOPTFLAGS) $(if $(call gb_LinkTarget__debug_enabled,sfx),$(gb_DEBUG_CFLAGS)) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) else $(eval $(call gb_Library_add_exception_objects,sfx,\ commit 3565a294189c6203a301a0971b7c9e48ab1e39df Author: Michael Stahl <[email protected]> Date: Fri Aug 16 14:49:17 2013 +0200 sd: remove NOOPT for optsitem.cxx and futext.cxx These have been added in initial CVS import. Change-Id: I8235db9d16b699f9736762bf097e99819753d616 diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 34a1525..2adb159 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -189,6 +189,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/annotations/annotationmanager \ sd/source/ui/annotations/annotationtag \ sd/source/ui/annotations/annotationwindow \ + sd/source/ui/app/optsitem \ sd/source/ui/app/sddll \ sd/source/ui/app/sddll1 \ sd/source/ui/app/sddll2 \ @@ -308,6 +309,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/func/fusnapln \ sd/source/ui/func/fusumry \ sd/source/ui/func/futempl \ + sd/source/ui/func/futext \ sd/source/ui/func/futhes \ sd/source/ui/func/futransf \ sd/source/ui/func/futxtatt \ @@ -600,17 +602,4 @@ endif endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_cxxobjects,sd,\ - sd/source/ui/app/optsitem \ - sd/source/ui/func/futext \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sd,\ - sd/source/ui/app/optsitem \ - sd/source/ui/func/futext \ -)) -endif - # vim: set noet sw=4 ts=4: commit 8f9b8b6e6f89f28f1a537a1b4a2aaac076ab7b08 Author: Michael Stahl <[email protected]> Date: Fri Aug 16 14:46:55 2013 +0200 sd: remove NOOPT for unowcntr.cxx This has been added in initial CVS import. Change-Id: Ibc1f68860019a639a665d314b1ebfc96d3ca1e45 diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 807926f..34a1525 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -464,6 +464,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/unoidl/unopback \ sd/source/ui/unoidl/unopool \ sd/source/ui/unoidl/unosrch \ + sd/source/ui/unoidl/unowcntr \ sd/source/ui/view/DocumentRenderer \ sd/source/ui/view/FormShellManager \ sd/source/ui/view/GraphicObjectBar \ @@ -612,15 +613,4 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ )) endif -ifeq ($(strip $(COM)),GCC) -$(eval $(call gb_Library_add_cxxobjects,sd,\ - sd/source/ui/unoidl/unowcntr \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,sd,\ - sd/source/ui/unoidl/unowcntr \ -)) -endif - # vim: set noet sw=4 ts=4: commit 4290075d3999fcfaee0753e47e0bb5bbfde111e1 Author: Michael Stahl <[email protected]> Date: Fri Aug 16 14:43:20 2013 +0200 slideshow: remove NOOPT for smilfunctionparser.cxx This was introduced for i#39915, which is about an infinite loop when compiling with Apple GCC 3.3 => obsolete Change-Id: I67d7c7975574f371aecac8f6dd4cf7800dd0725d diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index e8485ef..49c0c17 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -110,6 +110,7 @@ $(eval $(call gb_Library_add_exception_objects,slideshow,\ slideshow/source/engine/slide/slideimpl \ slideshow/source/engine/slide/userpaintoverlay \ slideshow/source/engine/slideview \ + slideshow/source/engine/smilfunctionparser \ slideshow/source/engine/soundplayer \ slideshow/source/engine/tools \ slideshow/source/engine/transitions/barndoorwipe \ @@ -146,17 +147,6 @@ $(eval $(call gb_Library_add_exception_objects,slideshow,\ slideshow/source/engine/wakeupevent \ )) -ifeq ($(strip $(OS)),MACOSX) -$(eval $(call gb_Library_add_cxxobjects,slideshow,\ - slideshow/source/engine/smilfunctionparser \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -else -$(eval $(call gb_Library_add_exception_objects,slideshow,\ - slideshow/source/engine/smilfunctionparser \ -)) -endif - ifneq ($(strip $(debug)$(DEBUG)),) $(eval $(call gb_Library_add_exception_objects,slideshow,\ slideshow/source/engine/sp_debug \ commit 70a35dd390038be31b2c840222ca644a6393325e Author: Michael Stahl <[email protected]> Date: Fri Aug 16 14:27:50 2013 +0200 svx: remove NOOPT for EnhancedCustomShapeFunctionParser SunStudio is not really a C++ compiler anyway, Linux/PPC has had the workaround accidentally disabled since OOo 3.4 and the hope is the last Apple toolchain that suffered here was the no longer supported GCC 4.0.1. Change-Id: If8addee9e2efe0db36059cbecfb9b9ffc78ffe88 diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 4b70cd4..3bb2616 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -87,6 +87,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/core/extedit \ svx/source/core/graphichelper \ svx/source/customshapes/EnhancedCustomShape2d \ + svx/source/customshapes/EnhancedCustomShapeFunctionParser \ svx/source/customshapes/EnhancedCustomShapeGeometry \ svx/source/customshapes/EnhancedCustomShapeTypeNames \ svx/source/dialog/checklbx \ @@ -438,20 +439,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ )) endif -# the following source file can't be compiled with optimization by some compilers (crash or endless loop): -# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC -# the latter is currently not supported by gbuild and needs a fix here later -ifeq ($(OS),$(filter-out SOLARIS MACOSX,$(OS))) -$(eval $(call gb_Library_add_exception_objects,svxcore,\ - svx/source/customshapes/EnhancedCustomShapeFunctionParser \ -)) -else -$(eval $(call gb_Library_add_cxxobjects,svxcore,\ - svx/source/customshapes/EnhancedCustomShapeFunctionParser \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) -endif - $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx)) $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
