Apache OpenOffice (AOO) Bugzilla – Issue 16414
11rc: solenv update for dylib-link-list + gcc 3.3
Last modified: 2004-02-15 07:31:16 UTC
solenv requires changes to use the dylib-link-list script. Also needs conditionalization for the gcc 2.95 static template data workarounds so that they only get executed for gcc 2.95. Dan
Created attachment 7379 [details] cd to solenv, patch -p0 < /path/to/patchfile
Created attachment 7391 [details] cd solenv/, patch -p0 < /path/to/patchfile SUPERCEDES previous patch. Removes -traditional-cpp flag
The 070303-2 patch SUPERCEDES the prevous patch. The meaning of -traditional- cpp changed between 2.95 and 3.3 for Apple's compiler, and now with 3.3 we shouldn't use this flag.
set target milestone
Created attachment 7466 [details] cd to solenv, patch -p0 < /path/to/patchfile REPLACES all previous solenv patches
The 070703 patch SUPERCEDES all previous patches and requires a clean checkout of solenv for cws_srx645_ooo11rc Dan
Created attachment 7467 [details] cd to solenv, patch -p0 < /path/to/patchfile REPLACES all previous patches. Adds -framework System to link line cause c++ doesn't
Created attachment 7507 [details] cd to solenv, patch -p0 < /path/to/patchfile SUPERCEDES all previous solenv.xxxx.11rc patches
Hi Dan, Okay I looked at this last patch (070903) and it all looks MacOSX specific and fine except for the changes to tg_zip.mk and _tg_zip.mk which affect all unx platforms and I am not sure I understand. So I approve all of the changes except for _tg_zip.mk and tg_zip.mk for committing to 1.1 once it re-opens. Can you explain why the *zip.mk changes do? I will then try them on my ppc Linux build to make sure they are okay. Thanks, Kevin
The problem with _tg_zip.mk is here: zip1langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ - type d ! -name CVS ! -name "." | sed "s/\.\///" ) When the find is executed, we get: [Jade:helpcontent/unx/swriter] dan% find ./ -type d ! -name CVS ! -name "." | sed "s/ \.\///" /english_us /english_us/swriter.idx And without the sed: [Jade:helpcontent/unx/swriter] dan% find ./ -type d ! -name CVS ! -name "." ./ .//english_us .//english_us/swriter.idx So the line zip1alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip1langdirs) $(eq,$(longlang_$i),$j $i $(NULL)))) never equates zip1langdirs with longlang_* because there's the / in front. This clobbers any language dependent zip stuff. The solution is to filter out _both_ ./ and .// with sed. Dan
Hi, Thanks for the xplanation. Fully approved. Kevin
Created attachment 7589 [details] cd to solenv, patch -p0 < /path/to/patchfile SUPERCEDES previous patches. Updates dylib-link-list to add libs from project lib dir
Created attachment 7649 [details] SUPERCEDES previous patches. Adds ranlib for static libraries and updates deliver.pl for LINKLIB dylib support.
Hi Dan, Okay I examined the entire solenv patch and it looks good. So approved! Kevin
committed to cws_srx645_ooo11rc2
verfied in 1.1.0.
close issue