Apache OpenOffice (AOO) Bugzilla – Issue 105735
solenv: remove unneccessary command line flags and defines
Last modified: 2013-08-07 15:34:42 UTC
a) I believe that all uses of __DMAKE are gone since the change of http://www.openoffice.org/servlets/ReadMsg?list=allcvs&msgNo=59629 so we could remove it from solenv b) I can see no uses of NEW_SOLAR anywhere c) I can see no uses of EXCEPTIONS_ON anywhere d) I can see no uses of SHAREDLIB anywhere e) I can see no used of _USE_NAMESPACE anywhere f) _PTHREADS + _REENTRANT are only needed by stlport, so can go inside .IF "$(USE_SYSTEM_STL)"!="YES" g) There's only one or two uses of "GLIBC" and as this is hardcoded in our .mks to be 2, there doesn't seem to be any reason not to remove the dead ifdef branches and remove -DGLIBC
Created attachment 65250 [details] remove these defines and shrink the command line
Im currently working on a proof-of-concept for a single-process gnu make build (mercurial cws: gnu_make). Other define switches that are likely obsolete and should at least be investigated: -D$(CVER) -DCUI -DCVER=$(CVER) -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE -DSUPD=$(UPD) -DSTLPORT_VERSION=$(STLPORT_VER) -DUNIX -DVCL And yes, it makes sense to at least remove: -DNEW_SOLAR -DEXCEPTIONS_ON -DSHAREDLIB -D_PTHREADS -D_REENTRANT -D_USE_NAMESPACE=1 -D__DMAKE -DGLIBC=2 $(PTHREAD_CFLAGS)
*) I removed -DCVER=$(CVER) already recently for some other work *) -D$(CVER) is used in scp2 only for windows to select which windows libs should be included into the installset. I got burned on that one recently. *) -DSTLPORT_VERSION=$(STLPORT_VER) is used in a few places unfortunately, but quite possibly removable if they're fixed up *) -DHAVE_GCC_VISIBILITY_FEATURE is used in a few places like http://svn.services.openoffice.org/opengrok/xref/Current%20%28trunk%29/sal/inc/sal/types.h to enable the visibility defines *) -DSUPD=$(UPD) is a bit of an abomination but used at the moment :-( *) -DUNIX seems to be only used once (though the define there should be easily replaced) in extensions somewhere in the mozilla plugin
GXX_INCLUDE_PATH is not really unused. It's used by stlport, compare issue 100049 UNIX is not only used in the extension/moz-plugin, but also in stoc, desktop, framwork, svx at least (not often, so can be replaced, but far from being used "once" - also quite heavily used in extensions
one other candidate I propose is: use only one of -DPOWERPC and -DPPC
cc'ing self
(re-)started issue on cws gnumake2 for the new build system.
removed defines that are gone in the old build system in changeset 327665719ffc on cws gnumake2 http://hg.services.openoffice.org/cws/gnumake2/rev/327665719ffc
@hjs: please verify both build systems are in sync. For additional obsoleted defines we should use a new issue IMHO.
target 3.4
this issue rather looks hijacked
.
I'm adding this comment to all open issues with Issue Type == PATCH. We have 220 such issues, many of them quite old. I apologize for that. We need your help in prioritizing which patches should be integrated into our next release, Apache OpenOffice 4.0. If you have submitted a patch and think it is applicable for AOO 4.0, please respond with a comment to let us know. On the other hand, if the patch is no longer relevant, please let us know that as well. If you have any general questions or want to discuss this further, please send a note to our dev mailing list: dev@openoffice.apache.org Thanks! -Rob