Apache OpenOffice (AOO) Bugzilla – Issue 5634
OOO_STABLE_1/X11+Aqua: berkeleydb does not compile
Last modified: 2004-03-25 04:28:52 UTC
1) BerkeleyDB module also has no clue about twolevel namespaces. Patch brings in Ed Peterlin's fix for berkeleydb in OO638C. 2) For some reason, when the configure script was trying to find java headers, it found them in solenv/unxmacxp/bin, because javac is there, and the configure script looks for javac, then uses that path. Because solenv/unxmacxp/bin was in PATH before system paths were, it was getting picked up as the java path. Patch corrects this.
Created attachment 1886 [details] cd to SRC_ROOT/berkeleydb, then patch -p0 < /path/to/patchfile
Created attachment 1927 [details] cd SRC_ROOT/berkeleydb, patch -p0 < /path/to/patchfile This is a diff against CVS as of 6/11/02 10PM CST
Created attachment 2359 [details] cd SRC_ROOT/berkeleydb, patch -p0 < /path/to/patchfile
Created attachment 2360 [details] After applying bekeleydb.OOO_STABLE_1.072502.patch, copy this file to SRC_ROOT/berkeleydb
Hi Dan, berkeleydb.OOO_STABLE_1.072502.patch is approved Heiner
Hi Dan, regarding db-3.2.9.patch: please have a look at line 122 of your patch: ! { echo "configure: error: cannot find java include files" 1>&2; exit 1; } This line seems to be accidently copied twice. I think it will break the configure process on non Darwin builds. Can you check this? Heiner
Hi, I see what you mean. On all platforms except Darwin if the first test -f "$JTOPDIR/include/jni.h" fails then it will fail anyway... Should I just remove that line from the db-3.2.9 patch file and resubmit it to the issue or do you want me to make the changes to my local sources and respin a patch with dmake create_patch? Dan
Hi Dan, better do a respin of the patch, otherwise the line count will fail and patch will emit some "fuzz" messages. Shouldn't be fatal, but ... Heiner
That's what I thought. Will do tonight if I get time. Dan
Created attachment 2374 [details] apply berkeleydb.OOO_STABLE_1.072502.patch, then copy this file to SRC_ROOT/berkeleydb
New corrected db-3.2.9.patch file attached (2002-07-27 version), it is the output of a dmake create_patch in SRC_ROOT/bekeleydb. Apply berkeleydb.OOO_STABLE_1.072502.patch and then copy the attached db-3.2.9.patch from 2002-07-27 to SRC_ROOT/berkeleydb. Please reapprove these patches for commit. Dan
Hi Dan, the complete patch is approved. Heiner
Committed to OOO_STABLE_1_PORTS
Hi Dan, Ed, I've done a cross-check build of OOO_STABLE_1_PORTS on LinuxIntel. Unfortunately, the latest patch breaks that build (I guess that includes got somehow messed up). Reopening for another review -> 'approval_pending'. Matthias
Matthias, Can you get a build log of this and where the error occured? I don't think any of us on the MacOS X team have Linux boxes right now we can test on... Dan
Status of this issue? Can someone do a crosscheck? Apply berkeleydb.OOO_STABLE_1.072502.patch and then copy the attached db-3.2.9.patch from 2002-07-27 to SRC_ROOT/berkeleydb. Thanks, Dan
Can someone crosscheck on Linux? Thanks, Dan
nominated for STABLE to do the crosscheck
Just to note, the gcc3 build will add in a number of changes for MacOS X, necessitating a new db-3.2.9.patch file. Shall we let this one go through into STABLE or shall we stop approval and wait for the new patch? Its probably a couple days away and if crosscheck isn't going to happen for a bit it might be worthwhile to wait. Dan
Created attachment 3695 [details] place in berkeleydb/
New patch is 112002. Adds a couple of minor changes, the first of which is to use ppc/asm locking. ---> Kevin, when you get a chance can you crosscheck this patch on Linux? Approval for this patch is requested. Thanks, Dan
Hi Dan, I dropped your latest patch into my OOO_STABLE_1 PPC Linux tree and rebuilt with absolutely no problems at all. So this one is approved. Kevin
db-3.2.9.patch from 11-20-02 committed to _PORTS. Dan
Reopen for tracking for merge to OOO_STABLE_1 or whatever. approval_pending -> merge_pending Dan
removed "ooo1.0" keyword in favour of target milestone "OOo 1.0.3".
Fixed in 103 GM, whatever.
close issue.