You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2017/12/15 14:54:32 UTC
svn commit: r1818290 - in /openoffice/trunk/main: automation/ canvas/
dbaccess/ framework/ sc/ sd/ sfx2/ solenv/gbuild/ svx/
Author: truckman
Date: Fri Dec 15 14:54:32 2017
New Revision: 1818290
URL: http://svn.apache.org/viewvc?rev=1818290&view=rev
Log:
Enhance gb_LinkTarget_set_*_optimization functions to allow multiple
targets to be specified.
Convert optimization overrides in the gbuild library makefiles to
use gb_LinkTarget_set_*_optimization.
There should be no functional change.
Modified:
openoffice/trunk/main/automation/Library_sts.mk
openoffice/trunk/main/canvas/Library_vclcanvas.mk
openoffice/trunk/main/dbaccess/Library_dbui.mk
openoffice/trunk/main/framework/Library_fwk.mk
openoffice/trunk/main/sc/Library_sc.mk
openoffice/trunk/main/sc/Library_scfilt.mk
openoffice/trunk/main/sd/Library_sd.mk
openoffice/trunk/main/sd/Library_sdfilt.mk
openoffice/trunk/main/sfx2/Library_sfx.mk
openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
openoffice/trunk/main/svx/Library_svxcore.mk
Modified: openoffice/trunk/main/automation/Library_sts.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/automation/Library_sts.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/automation/Library_sts.mk (original)
+++ openoffice/trunk/main/automation/Library_sts.mk Fri Dec 15 14:54:32 2017
@@ -94,12 +94,11 @@ endif
$(eval $(call gb_Library_add_exception_objects,sts,\
automation/source/server/XMLParser \
automation/source/server/server \
-))
-
-$(eval $(call gb_Library_add_cxxobjects,sts,\
automation/source/server/statemnt \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ automation/source/server/statement, $(gb_COMPILERNOOPTFLAGS) \
+))
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/canvas/Library_vclcanvas.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/Library_vclcanvas.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/canvas/Library_vclcanvas.mk (original)
+++ openoffice/trunk/main/canvas/Library_vclcanvas.mk Fri Dec 15 14:54:32 2017
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_add_exception_o
canvas/source/vcl/canvascustomsprite \
canvas/source/vcl/canvasfont \
canvas/source/vcl/canvashelper \
+ canvas/source/vcl/canvashelper_texturefill \
canvas/source/vcl/devicehelper \
canvas/source/vcl/impltools \
canvas/source/vcl/services \
@@ -80,14 +81,9 @@ $(eval $(call gb_Library_add_exception_o
))
# Solaris Sparc with Sun Compiler: noopt
-ifneq ($(strip($OS)),SOLARIS)
-$(eval $(call gb_Library_add_exception_objects,vclcanvas,\
- canvas/source/vcl/canvashelper_texturefill \
-))
-else
-$(eval $(call gb_Library_add_cxxobjects,vclcanvas,\
- canvas/source/vcl/canvashelper_texturefill \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+ifeq ($(strip($OS)),SOLARIS)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ canvas/source/vcl/canvashelper_texturefill, $(gb_COMPILERNOOPTFLAGS) \
))
endif
Modified: openoffice/trunk/main/dbaccess/Library_dbui.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/Library_dbui.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/Library_dbui.mk (original)
+++ openoffice/trunk/main/dbaccess/Library_dbui.mk Fri Dec 15 14:54:32 2017
@@ -269,6 +269,7 @@ $(eval $(call gb_Library_add_exception_o
dbaccess/source/ui/uno/UserSettingsDlg \
dbaccess/source/ui/uno/admindlg \
dbaccess/source/ui/uno/composerdialogs \
+ dbaccess/source/ui/uno/copytablewizard \
dbaccess/source/ui/uno/dbinteraction \
dbaccess/source/ui/uno/textconnectionsettings_uno \
dbaccess/source/ui/uno/unoDirectSql \
@@ -276,6 +277,15 @@ $(eval $(call gb_Library_add_exception_o
dbaccess/source/ui/uno/unosqlmessage \
))
+# 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
+ifneq ($(COM),$(filter-out GCC,$(COM)))
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ dbaccess/source/ui/uno/copytablewizard, $(gb_COMPILERNOOPTFLAGS) \
+))
+endif
+
$(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/shared/dbu_reghelper \
dbaccess/source/shared/dbustrings \
@@ -299,18 +309,4 @@ $(eval $(call gb_Library_add_noexception
dbaccess/source/ui/querydesign/TableFieldInfo \
))
-# 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 ($(COM),$(filter-out GCC,$(COM)))
-$(eval $(call gb_Library_add_exception_objects,dbui,\
- dbaccess/source/ui/uno/copytablewizard \
-))
-else
-$(eval $(call gb_Library_add_cxxobjects,dbui,\
- dbaccess/source/ui/uno/copytablewizard \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-endif
-
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/framework/Library_fwk.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/Library_fwk.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/framework/Library_fwk.mk (original)
+++ openoffice/trunk/main/framework/Library_fwk.mk Fri Dec 15 14:54:32 2017
@@ -61,11 +61,6 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
-ifeq ($(OS),MACOSX)
- $(call gb_LinkTarget_set_cxx_optimization,framework/source/loadenv/loadenv,$(gb_COMPILEROPT1FLAGS))
-endif
-
$(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/accelerators/acceleratorcache \
framework/source/accelerators/acceleratorconfiguration \
@@ -195,4 +190,11 @@ $(eval $(call gb_Library_add_exception_o
framework/source/xml/imagesdocumenthandler \
))
+# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ framework/source/loadenv/loadenv, $(gb_COMPILEROPT1FLAGS) \
+))
+endif
+
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/sc/Library_sc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/Library_sc.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/sc/Library_sc.mk (original)
+++ openoffice/trunk/main/sc/Library_sc.mk Fri Dec 15 14:54:32 2017
@@ -133,14 +133,19 @@ $(eval $(call gb_Library_add_exception_o
sc/source/ui/view/tabview4 \
sc/source/ui/view/tabview5 \
sc/source/ui/view/viewfunc \
+ sc/source/ui/view/viewfun2 \
sc/source/ui/view/viewfun3 \
+ sc/source/ui/view/viewfun4 \
sc/source/ui/view/viewfun5 \
sc/source/ui/view/viewfun6 \
sc/source/ui/view/viewfun7 \
sc/source/ui/view/dbfunc \
+ sc/source/ui/view/dbfunc2 \
sc/source/ui/view/dbfunc3 \
sc/source/ui/view/dbfunc4 \
+ sc/source/ui/view/drawview \
sc/source/ui/view/tabvwsh \
+ sc/source/ui/view/tabvwsh2 \
sc/source/ui/view/tabvwsh3 \
sc/source/ui/view/tabvwsh4 \
sc/source/ui/view/tabvwsh5 \
@@ -265,6 +270,7 @@ $(eval $(call gb_Library_add_exception_o
sc/source/ui/drawfunc/fupoor \
sc/source/ui/drawfunc/fumark \
sc/source/ui/drawfunc/fudraw \
+ sc/source/ui/drawfunc/fusel \
sc/source/ui/drawfunc/fusel2 \
sc/source/ui/drawfunc/fuconstr \
sc/source/ui/drawfunc/fuconrec \
@@ -303,6 +309,7 @@ $(eval $(call gb_Library_add_exception_o
sc/source/ui/navipi/navcitem \
sc/source/ui/navipi/scenwnd \
sc/source/ui/navipi/content \
+ sc/source/ui/unoobj/cellsuno \
sc/source/ui/unoobj/docuno \
sc/source/ui/unoobj/servuno \
sc/source/ui/unoobj/defltuno \
@@ -323,6 +330,7 @@ $(eval $(call gb_Library_add_exception_o
sc/source/ui/unoobj/datauno \
sc/source/ui/unoobj/dapiuno \
sc/source/ui/unoobj/chartuno \
+ sc/source/ui/unoobj/chart2uno \
sc/source/ui/unoobj/shapeuno \
sc/source/ui/unoobj/pageuno \
sc/source/ui/unoobj/forbiuno \
@@ -349,15 +357,20 @@ $(eval $(call gb_Library_add_exception_o
sc/source/core/data/attrib \
sc/source/core/data/autonamecache \
sc/source/core/data/bcaslot \
+ sc/source/core/data/cell \
sc/source/core/data/cell2 \
sc/source/core/data/clipparam \
sc/source/core/data/column \
+ sc/source/core/data/column2 \
+ sc/source/core/data/column3 \
sc/source/core/data/compressedarray \
+ sc/source/core/data/conditio \
sc/source/core/data/dbdocutl \
sc/source/core/data/dociter \
sc/source/core/data/docpool \
sc/source/core/data/documen2 \
sc/source/core/data/documen3 \
+ sc/source/core/data/documen4 \
sc/source/core/data/documen5 \
sc/source/core/data/documen6 \
sc/source/core/data/documen7 \
@@ -400,11 +413,14 @@ $(eval $(call gb_Library_add_exception_o
sc/source/core/data/tabbgcolor \
sc/source/core/data/table1 \
sc/source/core/data/table2 \
+ sc/source/core/data/table3 \
+ sc/source/core/data/table4 \
sc/source/core/data/table5 \
sc/source/core/data/table6 \
sc/source/core/data/tabprotection \
sc/source/core/data/userdat \
sc/source/core/data/postit \
+ sc/source/core/data/validat \
sc/source/core/tool/addincfg \
sc/source/core/tool/addincol \
sc/source/core/tool/addinhelpid \
@@ -416,6 +432,7 @@ $(eval $(call gb_Library_add_exception_o
sc/source/core/tool/callform \
sc/source/core/tool/cellform \
sc/source/core/tool/cellkeytranslator \
+ sc/source/core/tool/chartarr \
sc/source/core/tool/charthelper \
sc/source/core/tool/chartpos \
sc/source/core/tool/chartlis \
@@ -437,8 +454,11 @@ $(eval $(call gb_Library_add_exception_o
sc/source/core/tool/hints \
sc/source/core/tool/inputopt \
sc/source/core/tool/interpr1 \
+ sc/source/core/tool/interpr2 \
sc/source/core/tool/interpr3 \
+ sc/source/core/tool/interpr4 \
sc/source/core/tool/interpr5 \
+ sc/source/core/tool/interpr6 \
sc/source/core/tool/lookupcache \
sc/source/core/tool/navicfg \
sc/source/core/tool/odffmap \
@@ -459,7 +479,9 @@ $(eval $(call gb_Library_add_exception_o
sc/source/core/tool/reftokenhelper \
sc/source/core/tool/refupdat \
sc/source/core/tool/scmatrix \
+ sc/source/core/tool/subtotal \
sc/source/core/tool/stringutil \
+ sc/source/core/tool/token \
sc/source/core/tool/unitconv \
sc/source/core/tool/userlist \
sc/source/core/tool/viewopti \
@@ -474,6 +496,7 @@ $(eval $(call gb_Library_add_exception_o
sc/source/filter/xml/xmlrowi \
sc/source/filter/xml/xmlcelli \
sc/source/filter/xml/xmlconti \
+ sc/source/filter/xml/xmlcvali \
sc/source/filter/xml/xmlcoli \
sc/source/filter/xml/xmlsubti \
sc/source/filter/xml/xmlnexpi \
@@ -538,90 +561,56 @@ $(eval $(call gb_Library_add_exception_o
sc/source/ui/Accessibility/AccessibleCsvControl \
))
-$(eval $(call gb_Library_add_cxxobjects,sc,\
- sc/source/ui/view/drawview \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ sc/source/filter/xml/xmlcvali \
+ sc/source/ui/drawfunc/fusel \
sc/source/ui/view/dbfunc2 \
+ sc/source/ui/view/drawview \
sc/source/ui/view/tabvwsh2 \
- sc/source/ui/drawfunc/fusel \
- sc/source/filter/xml/xmlcvali \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+ , $(gb_COMPILERNOOPTFLAGS) \
))
-
+
ifeq ($(OS)$(COM)$(CPUNAME),LINUXGCCPOWERPC)
-$(eval $(call gb_Library_add_cxxobjects,sc,\
- sc/source/core/tool/subtotal \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,sc,\
- sc/source/core/tool/subtotal \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ sc/source/core/tool/subtotal, $(gb_COMPILERNOOPTFLAGS) \
))
endif
ifeq ($(OS)$(COM)$(CPUNAME),LINUXGCCSPARC)
-$(eval $(call gb_Library_add_cxxobjects,sc,\
- sc/source/ui/view/viewfun4 \
- sc/source/ui/view/viewfun2 \
- sc/source/ui/unoobj/cellsuno \
- sc/source/core/data/column2 \
- sc/source/core/data/column3 \
- sc/source/core/data/table3 \
- sc/source/core/data/table4 \
- sc/source/core/data/documen4 \
- sc/source/core/data/conditio \
- sc/source/core/data/validat \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
sc/source/core/data/cell \
- sc/source/core/tool/interpr2 \
- sc/source/core/tool/interpr4 \
- sc/source/core/tool/token \
- sc/source/core/tool/chartarr \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,sc,\
- sc/source/ui/view/viewfun4 \
- sc/source/ui/view/viewfun2 \
- sc/source/ui/unoobj/cellsuno \
sc/source/core/data/column2 \
sc/source/core/data/column3 \
+ sc/source/core/data/conditio \
+ sc/source/core/data/documen4 \
sc/source/core/data/table3 \
sc/source/core/data/table4 \
- sc/source/core/data/documen4 \
- sc/source/core/data/conditio \
sc/source/core/data/validat \
- sc/source/core/data/cell \
+ sc/source/core/tool/chartarr \
sc/source/core/tool/interpr2 \
sc/source/core/tool/interpr4 \
- sc/source/core/tool/token \
- sc/source/core/tool/chartarr \
+ sc/source/core/tool/token
+ sc/source/ui/unoobj/cellsuno \
+ sc/source/ui/view/viewfun2 \
+ sc/source/ui/view/viewfun4 \
+ , $(gb_COMPILERNOOPTFLAGS) \
))
endif
ifeq ($(GUI),OS2)
-$(eval $(call gb_Library_add_cxxobjects,sc,\
- sc/source/core/tool/interpr6 \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,sc,\
- sc/source/core/tool/interpr6 \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ sc/source/core/tool/interpr6, $(gb_COMPILERNOOPTFLAGS) \
))
endif
# Work around bug in gcc 4.2 / 4.3, see
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35182
ifeq ($(COM),GCC)
-$(eval $(call gb_Library_add_cxxobjects,sc,\
- sc/source/ui/unoobj/chart2uno \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,sc,\
- sc/source/ui/unoobj/chart2uno \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ sc/source/ui/unoobj/chart2uno, $(gb_COMPILERNOOPTFLAGS) \
))
endif
-
$(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
$(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
Modified: openoffice/trunk/main/sc/Library_scfilt.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/Library_scfilt.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/sc/Library_scfilt.mk (original)
+++ openoffice/trunk/main/sc/Library_scfilt.mk Fri Dec 15 14:54:32 2017
@@ -105,6 +105,7 @@ $(eval $(call gb_Library_add_exception_o
sc/source/filter/excel/xeview \
sc/source/filter/excel/xichart \
sc/source/filter/excel/xicontent \
+ sc/source/filter/excel/xiescher \
sc/source/filter/excel/xiformula \
sc/source/filter/excel/xihelper \
sc/source/filter/excel/xilink \
@@ -163,13 +164,8 @@ $(eval $(call gb_Library_add_exception_o
))
ifeq ($(OS)$(COM)$(CPUNAME),LINUXGCCSPARC)
-$(eval $(call gb_Library_add_cxxobjects,scfilt,\
- sc/source/filter/excel/xiescher \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,scfilt,\
- sc/source/filter/excel/xiescher \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ sc/source/filter/excel/xiescher, $(gb_COMPILERNOOPTFLAGS) \
))
endif
Modified: openoffice/trunk/main/sd/Library_sd.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/Library_sd.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/sd/Library_sd.mk (original)
+++ openoffice/trunk/main/sd/Library_sd.mk Fri Dec 15 14:54:32 2017
@@ -152,6 +152,7 @@ $(eval $(call gb_Library_add_exception_o
sd/source/ui/view/ViewTabBar \
sd/source/ui/view/WindowUpdater \
sd/source/ui/view/viewoverlaymanager \
+ sd/source/ui/app/optsitem \
sd/source/ui/app/sdmod \
sd/source/ui/app/sdmod1 \
sd/source/ui/app/sdmod2 \
@@ -258,6 +259,7 @@ $(eval $(call gb_Library_add_exception_o
sd/source/ui/unoidl/unopback \
sd/source/ui/unoidl/unodoc \
sd/source/ui/unoidl/unomodule \
+ sd/source/ui/unoidl/unowcntr \
sd/source/ui/unoidl/randomnode \
sd/source/ui/animations/CustomAnimationCreateDialog \
sd/source/ui/animations/CustomAnimationDialog \
@@ -295,6 +297,7 @@ $(eval $(call gb_Library_add_exception_o
sd/source/ui/func/undolayer \
sd/source/ui/func/fupoor \
sd/source/ui/func/fudraw \
+ sd/source/ui/func/futext \
sd/source/ui/func/fuzoom \
sd/source/ui/func/fusel \
sd/source/ui/func/fuconstr \
@@ -473,26 +476,16 @@ $(eval $(call gb_Library_add_exception_o
# 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),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 \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ sd/source/ui/app/optsitem \
+ sd/source/ui/func/futext \
+ , $(gb_COMPILERNOOPTFLAGS) \
))
endif
ifeq ($(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 \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ sd/source/ui/unoidl/unowcntr, $(gb_COMPILERNOOPTFLAGS) \
))
endif
Modified: openoffice/trunk/main/sd/Library_sdfilt.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/Library_sdfilt.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/sd/Library_sdfilt.mk (original)
+++ openoffice/trunk/main/sd/Library_sdfilt.mk Fri Dec 15 14:54:32 2017
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_exception_o
sd/source/filter/ppt/pptatom \
sd/source/filter/ppt/ppt97animations \
sd/source/filter/eppt/eppt \
+ sd/source/filter/eppt/epptso \
sd/source/filter/eppt/escherex \
sd/source/filter/eppt/pptexanimations \
sd/source/filter/eppt/pptexsoundcollection \
@@ -72,13 +73,8 @@ $(eval $(call gb_Library_add_exception_o
# 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 ($(COM),GCC)
-$(eval $(call gb_Library_add_cxxobjects,sdfilt,\
- sd/source/filter/eppt/epptso \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,sdfilt,\
- sd/source/filter/eppt/epptso \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ sd/source/filter/eppt/epptso, $(gb_COMPILERNOOPTFLAGS) \
))
endif
Modified: openoffice/trunk/main/sfx2/Library_sfx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/Library_sfx.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/Library_sfx.mk (original)
+++ openoffice/trunk/main/sfx2/Library_sfx.mk Fri Dec 15 14:54:32 2017
@@ -128,6 +128,7 @@ $(eval $(call gb_Library_add_exception_o
sfx2/source/config/evntconf \
sfx2/source/control/bindings \
sfx2/source/control/ctrlitem \
+ sfx2/source/control/dispatch \
sfx2/source/control/macro \
sfx2/source/control/minfitem \
sfx2/source/control/msg \
@@ -278,13 +279,8 @@ $(eval $(call gb_Library_add_exception_o
# "opening stylist, select graphic style, select modify from context menu, cancel dialog, close stylist"
# only on unxlngi6 and unxlngi6.pro platform
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_cxxobjects,sfx,\
- sfx2/source/control/dispatch \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,sfx,\
- sfx2/source/control/dispatch \
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ sfx2/source/control/dispatch, $(gb_COMPILERNOOPTFLAGS) \
))
endif
Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Fri Dec 15 14:54:32 2017
@@ -480,19 +480,19 @@ endif
endef
define gb_LinkTarget_set_c_optimization
-$(call gb_CObject_get_target,$(1)) : CFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CFLAGS)) $(2)
+$(foreach object,$(1),$(eval $(call gb_CObject_get_target,$(object)) : CFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CFLAGS)) $(2)))
endef
define gb_LinkTarget_set_cxx_optimization
-$(call gb_CxxObject_get_target,$(1)) : CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2)
+$(foreach object,$(1),$(eval $(call gb_CxxObject_get_target,$(object)) : CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2)))
endef
define gb_LinkTarget_set_gencxx_optimization
-$(call gb_GenCxxObject_get_target,$(1)) : CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2)
+$(foreach object,$(1),$(eval $(call gb_GenCxxObject_get_target,$(object)) : CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2)))
endef
define gb_LinkTarget_set_objcxx_optimization
-$(call gb_ObjCxxObject_get_target,$(1)) : OBJCXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(OBJCXXFLAGS)) $(2)
+$(foreach object,$(1),$(eval $(call gb_ObjCxxObject_get_target,$(object)) : OBJCXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(OBJCXXFLAGS)) $(2)))
endef
define gb_LinkTarget_set_include
Modified: openoffice/trunk/main/svx/Library_svxcore.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Library_svxcore.mk?rev=1818290&r1=1818289&r2=1818290&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Library_svxcore.mk (original)
+++ openoffice/trunk/main/svx/Library_svxcore.mk Fri Dec 15 14:54:32 2017
@@ -89,6 +89,7 @@ $(call gb_Library_use_external,svxcore,i
$(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/core/coreservices \
svx/source/customshapes/EnhancedCustomShape2d \
+ svx/source/customshapes/EnhancedCustomShapeFunctionParser \
svx/source/customshapes/EnhancedCustomShapeGeometry \
svx/source/customshapes/EnhancedCustomShapeTypeNames \
svx/source/dialog/checklbx \
@@ -441,14 +442,10 @@ $(eval $(call gb_Library_add_exception_o
# 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) \
+ifneq ($(OS),$(filter-out SOLARIS MACOSX,$(OS)))
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ svx/source/customshapes/EnhancedCustomShapeFunctionParser, \
+ $(gb_COMPILERNOOPTFLAGS) \
))
endif
Re: svn commit: r1818290 - in /openoffice/trunk/main: automation/
canvas/ dbaccess/ framework/ sc/ sd/ sfx2/ solenv/gbuild/ svx/
Posted by Don Lewis <tr...@apache.org>.
On 15 Dec, truckman@apache.org wrote:
> Author: truckman
> Date: Fri Dec 15 14:54:32 2017
> New Revision: 1818290
>
> URL: http://svn.apache.org/viewvc?rev=1818290&view=rev
> Log:
> Enhance gb_LinkTarget_set_*_optimization functions to allow multiple
> targets to be specified.
>
> Convert optimization overrides in the gbuild library makefiles to
> use gb_LinkTarget_set_*_optimization.
>
> There should be no functional change.
Actually, the last sentence is not true. With the old way changing the
optimization flags for a particular object, the debug flags would get
lost, as well as any $CXXFLAGS passed in the environment. In the new
way of doing things, the debug flags are preserved as well as $CXXFLAGS
from the environment. If CXXFLAGS from the environment contains
different optimization flags, the override value will be appended.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org