Apache OpenOffice (AOO) Bugzilla – Full Text Issue Listing |
Summary: | Configury updates for x86-64 | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | Build Tools | Reporter: | gbeauche <gbeauchesne> | ||||||||
Component: | code | Assignee: | sander_traveling | ||||||||
Status: | CLOSED FIXED | QA Contact: | issues@tools <issues> | ||||||||
Severity: | Trivial | ||||||||||
Priority: | P3 | CC: | foskey, issues, pavel | ||||||||
Version: | OOo 1.0.1 | ||||||||||
Target Milestone: | OOo 2.0 | ||||||||||
Hardware: | PC | ||||||||||
OS: | Linux, all | ||||||||||
Issue Type: | PATCH | Latest Confirmation in: | --- | ||||||||
Developer Difficulty: | --- | ||||||||||
Issue Depends on: | |||||||||||
Issue Blocks: | 8584 | ||||||||||
Attachments: |
|
Description
gbeauche
2002-10-22 14:53:21 UTC
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 ... |