Apache OpenOffice (AOO) Bugzilla – Issue 12734
OOO_STABLE_1_PORTS/X11+Aqua: Apple JavaVM 1.4.1 build fixes
Last modified: 2004-10-15 04:29:01 UTC
With the 1.4.1 version, there no longer exists a jni.h in the /System/Library/Frameworks/JavaVM.framework/Headers/ directory. We explicitly use this file as the check to determine whether Java is present on the system, through our patch to the berekeleydb module's configure script. The patch changes the check to use JavaVM.h, which should be present through all Apple JavaVM.frameworks in both 10.1 and 10.2. Dan
Dan, I believe that your approach causes more harm than good. Specifically, there are two problems with your approach: 1. The JavaVM.h file does not #include jni.h or any files that #include jni.h. Without explicitly including jni.h, the stoc module will not compile. 2. The JavaVM.h file is an Objective-C header file. This will cause any C or C++ that includes it on Mac OS X 10.1 to have parsing problems. I think the better solution is to patch the configure script so that some alternate "-I" paths are added after the default. Patrick
Patrick, What then should we check for in the berkeleydb configure script to ensure that we have JavaVM.framework? Should we hardcode in checks for the 1.3.1 version headers? dan
Created attachment 5297 [details] copy file to berkeleydb/ Detectes Apple JDK 1.3.1 headers when JDK 1.4.1 is installed
Created attachment 5298 [details] cd to config_office, patch -p0 < /path/to/patchfile Adds Apple Java JRE 1.3.1 to SOLARINC path explicitly because the 1.4.1 JRE doesn't have any includes files
Please approve for commit to PORTS: --------------------------------- db-3.2.9.patch config_office.java141.032703.patch These patches explicitly detect the java 1.3.1 header files and add the java 1.3.1 headers path to SOLARINC. Dan
Created attachment 5300 [details] cd to XmlSearch, patch -p0 < /path/to/patchfile Extra ; made Apple Java 1.4 _very_ unhappy. Patch removes it
Please approve the following patches: db-3.2.9.patch config_office.java141.032703.patch XmlSearch.java14.032703.patch Dan
Created attachment 5306 [details] cd to sj2, patch -p0 < /path/to/patchfile Adds Java 1.4 compatibility to sj2, taken from HEAD
Please approve the following patches: --------------------------------------- db-3.2.9.patch config_office.java141.032703.patch XmlSearch.java14.032703.patch sj2.java14.032703.patch Dan
Hi Dan, These look fine so Apporoved. BTW: how did you ever figure out the issue with jdk 1.4 was with the two ;; ! Kevin
Committed to PORTS: --------------------------------------- db-3.2.9.patch config_office.java141.032703.patch XmlSearch.java14.032703.patch sj2.java14.032703.patch Kevin, javac actually complained at me about an "unreachable statement" or something like that, and referenced this exact line with a carat pointing to the second semicolon. I looked at it and decided that it didn't really look right, so removed the ; and it was all fine :)
Dan, this issue has no target milestone assigned, so we don't track it for any release, do you want to assign one?
Created attachment 5628 [details] Apply the patch by executing the following commands: cd $SRC_ROOT/berkeleydb ; patch -p0 < /path/to/patch/file
Created attachment 5629 [details] This is the replacement file for $SRC_ROOT/berkeleydb/db-3.2.9.patch that was generated using "dmake create_patch". This should be used instead of the berkeleydb.patch file that was posted earlier today.
The attached patch allows berkeleydb to find the JavaVM headers on Mac OS X 10.1. The berkeleydb patch in this issue that was posted on 3/27/2003 broke the Mac OS X 10.1 build.
Patrick, I approve db-3.2.9.patch for commit to PORTS. Go for it. Dan
Dan, Can you commit this patch for me? cvs just hangs when I try to commit. This seems to be a problem similar to my inability to post attachments in IssueZilla.
Updated db-3.2.9.patch committed to PORTS by me. Dan
retarget
Also in 1.1rc3
close issue.