Apache OpenOffice (AOO) Bugzilla – Issue 61638
Don't import every environment variable as dmake macro
Last modified: 2013-08-07 15:34:52 UTC
As discussed on IRC. Not importing every environment variable as dmake macro but only the used ones can give more control over the macros used in the build environment. The following two patches provide this for the OOo environment. importenv.mk is generated while running configure (set_soenv). Currently importenv.mk is generated directly in solver/... but in a final version this file should be created alongside *env.set and copied by it (*env.set) if the OOo environment is set up. This patch survived a full OOo W32-tcsh build and it should be fairly straight forward to implement something like this into setsolar.pl.
Created attachment 33864 [details] Patch for config_office/
Created attachment 33865 [details] Patch for solenv/
What I did was the following: While set_soenv generates the *env.set file it remembers the names of the written environment variables. Then it adds the variable to the list of imported macros $SOLARVERSION/$INPATH/inc/importenv.mk if it is not excluded by solenv/inc/dmakenoimport.lst Additional, any variable that is mentioned in solenv/inc/dmakeextraimport.lst is also added to importenv.mk. And finally dmake doesn't import all environment variable any longer but uses importenv.mk instead.
set target...