Apache OpenOffice (AOO) Bugzilla – Issue 11327
OOO_STABLE_1_PORTS: Problem in bridges with updated solenv
Last modified: 2007-02-05 03:41:39 UTC
Building fails in bridges (undefined symbols) when using the dylib-link-list script. The attached patches fix this problem, remove non-existent directory from link commands, and suppresses long-double warnings when building.
Created attachment 4620 [details] cd SRC_ROOT/solenv/unxmacxp/bin; patch -p0 dylib-link-list solenv.linklist.OOO_STABLE_1_PORTS.020903.patch
Created attachment 4621 [details] cd SRC_ROOT/config_office; patch -p0 < config_office.soenv.OOO_STABLE_1_PORTS.020903.patch
Created attachment 4622 [details] cd SRC_ROOT/solenv; patch -p0 < solenv.unxmacxp.mk.OOO_STABLE_1_PORTS.020903.patch
solenv.unxmacxp.mk patch has been approved by me and committed. I'd like to get someone else to look over the config_office patch just to make sure, and I believe the linklist patch will be fine too, but we should probably do a full build with it just to make sure. dAn
set_sonev.1 is no longer in use on PORTING so this patch will not have any effect. PLease review whether this is required for set_soenv.in and resubmit.
Yes, set_soenv.in also needs patch. This patch supercedes config_office.soenv.OOO_STABLE_1_PORTS.020903.patch.
Created attachment 4721 [details] cd SRC_ROOT/config_office; patch -p0 < config_office.soenv.OOO_STABLE_1_PORTS.021303.patch
Committed to porting and to baseline 644 config_office.
The following patches were committed to _PORTS: solenv.linklist.OOO_STABLE_1_PORTS.020903.patch config_office.soenv.OOO_STABLE_1_PORTS.021303.patch Dan
set_soenv.in merged with 644 already. solenv patches require merging.
The committed patch to solenv/inc/unxmacp.mk and config_office does not work on Mac OS X 10.1. The patch replaced all references to "cc" with "gcc" and "g++". Since "gcc" and "g++" do not exist on Mac OS X 10.1, this patch should either be reversed or simple "gcc" and "g++" wrapper scripts that exec "cc" should be added to the solenv/unxmacxp/bin directory like the following: #!/bin/sh exec /usr/bin/cc "${@}" If you use the wrapper approach, be sure to chmod them 755 before you cvs add and commit them.
You should be able to work around this limitation by this: CC=/path/to/cc CXX=/path/to/c++ ./configure This will create two variables in the .set file with CC=??? and CXX=??? In your settigns file you then use CC*=gcc & CXX*=g++. This is a default and the environment variables will override it. Let me know what happens and I can start working on this.
Ken, Your suggestion will work for the configure script. However, Scott's patch to the solenv/inc/unxmacxp.mk file hardcoded the following macros: CC=g++ LINK=g++ Apparently, there is some need to set CC to a specific executable. So, even if you properly override CC, any CC set by the configure script will always get overridden by the above hardcoding. One possible solution to this would be to change the above hardcoded macros to the following: CC=c++ LINK=c++ Since c++ is a softlink to the same executable as g++ on Mac OS X 10.2, this should have the same effect that the original patch had without breaking Mac OS X 10.1.
Reassigning reopened issue to Dan since he committed the last patch.
Created attachment 5655 [details] Apply the pathch by executing the following commands: cd $SRC_ROOT/solenv ; patch -p0 < /path/to/patch/file
solenv.patch approved and committed to PORTS by me. dan
retarget
Fixed in 103 GM.
Closing. Branch cannot be updated and is no longer maintained. James McKenzie