Apache OpenOffice (AOO) Bugzilla – Issue 8585
Configury updates for x86-64
Last modified: 2004-08-12 17:27:12 UTC
Hi, this patch against OOo 1.0.1 changes some bits for x86-64 support. A point to take care of is that x86-64 is a "lib64" platform. That is, native libraries reside in */lib64 and 32-bit libraries remain in */lib. However, OOo libraries used for the build process obviously have to remain in */lib. e.g. -L$SOLARENV/$OUTPATH/lib. Another point to consider is where Sun will actually place x86-64 libraries for the JDK when ported. We don't need a native JDK for the port. At the very least, gcj is enough. Note: I chose OUTPATH="unxlngx4"
Created attachment 3278 [details] Configury changes for x86-64
I can check this patch in on the stable branch. However, on the developer branch, we got rid of set_soenv.1 and moved to set_soenv.in. Probably that change will occur on the next stable release, too. So you may want to adapt your patch later.
patches checked in on OOO_STABLE_1. However, in the first hunk of the configure.in patch I had to change $CC to $GCC due to other recent changes. It would be great if you could confirm.
mh->gbeauche: please confirm as requested by Armin.
Created attachment 4480 [details] Updated patch for 1.0.2
Patch updated to suit set_soenv.in from OOO_STABLE_1 (actually 1.0.2 here). Also note that original file didn't handle unxlngppc4 which I added in my local tree. i.e. you may encounter a conflict/hunk reject due to that.
Note that I also assume Sun Java will leave jar files in */lib and there would also be an "x86_64" subdirectory under */lib et al. i.e. not using lib64 conventions here. However, I don't know the current state of Sun Java native support for x86-64. I would be happy to hear back from that, being a member of SDC/JDC too.
retarget to post 1.1 release
reset target milestone
I updated this patch to current cws_srx645_ooo111fix1.
Created attachment 11214 [details] Add x86_64 to set_soenv.in
Sander, please take a look at it.
AIX is only sometimes 64bit, commit and I will fix it later. Has this been verified on netBSD? If so approved.
@ken: I can verify this only on FreeBSD, is it enough for you? Why do you want NetBSD specifically?
($platform eq "$Irix64") || ($platform eq "$FreeBSD") || ($platform eq "AIX")) { - $SOLAREXTRALIB = $L.$par_dir.$LIB; + $SOLAREXTRALIB = $L.$par_dir.$LIB64; } These lines effect aix (I can check this later) and netbsd.
Yes, it affects NetBSD and FreeBSD the same way, but: $LIB = $ds."lib"; +$LIB64 = $ds."lib"; +$LIB64 .= "64" +if ($platform eq "Linux" && $machine_type eq "x86_64"); ie. LIB64 is the same as LIB except on Linux running on x86_64. But I will verify this on FreeBSD. I do not have access to NetBSD box.
From code inspection: The patch looks fine for NetBSD, therefore also approved in that respect.
Ken, do you think we can integrate to 20031216?
Fixed on cws_src680_ooo20031216.
Closing ...