From cb1f3dafe7c7bd71eb75f509e4ad64c039c4771a Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Tue, 8 Sep 2009 21:50:10 -0700
Subject: [PATCH] fix MacOSX10.6.sdk build issues

---
 bindings/java/hyperic_jni/jni-build.xml       |  5 ++---
 .../src/org/hyperic/jni/ArchNameTask.java     | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/bindings/java/hyperic_jni/jni-build.xml b/bindings/java/hyperic_jni/jni-build.xml
index 034ec21f..00229756 100644
--- a/bindings/java/hyperic_jni/jni-build.xml
+++ b/bindings/java/hyperic_jni/jni-build.xml
@@ -25,7 +25,6 @@ USA.
   <property name="jni.src.java" value="src"/>
   <property name="jni.libprefix" value="java"/>
   <property name="jni.libversion" value=""/>
-  <property name="osx.min" value="-mmacosx-version-min=10.3"/>
 
   <property name="cpptasks.jar" location="lib/cpptasks.jar"/>
 
@@ -357,7 +356,7 @@ USA.
         <compilerarg value="${uni.sdk}"/>
         <compilerarg value="-arch"/>
         <compilerarg value="${uni.arch}"/>
-        <compilerarg value="${osx.min}"/>
+        <compilerarg value="-mmacosx-version-min=${osx.min}"/>
 
         <sysincludepath location="/Developer/Headers/FlatCarbon"/>
 
@@ -372,7 +371,7 @@ USA.
         <linkerarg value="-Wl,-syslibroot,${uni.sdk}"/>
         <linkerarg value="-arch"/>
         <linkerarg value="${uni.arch}"/>
-        <linkerarg value="${osx.min}"/>
+        <linkerarg value="-mmacosx-version-min=${osx.min}"/>
 
         <!-- for Gestalt() -->
         <linkerarg value="-framework"/>
diff --git a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
index a8bd62f2..1f28b19f 100644
--- a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
+++ b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
@@ -97,13 +97,28 @@ public class ArchNameTask extends Task {
                 });
             if (sdks != null) {
                 Arrays.sort(sdks);
-                final String prop = "uni.sdk";
+                String prop = "uni.sdk";
                 String sdk = getProject().getProperty(prop);
+                String defaultMin = "10.3";
+
                 if (sdk == null) {
-                    sdk = sdks[sdks.length-1].getPath();
+                    int ix = sdks.length-1;
+                    sdk = sdks[ix].getPath();
+                    if ((sdk.indexOf("10.6") != -1) && (ix > 0)) {
+                        sdk = sdks[ix-1].getPath(); //downgrade due to 64-bit ppc issues XXX
+                        defaultMin = "10.5";
+                    }
                     getProject().setProperty(prop, sdk);
                 }
                 System.out.println("Using SDK=" + sdk);
+
+                prop = "osx.min";
+                String min = getProject().getProperty(prop);
+                if (min == null) {
+                    min = defaultMin;
+                    getProject().setProperty(prop, min);
+                }
+                System.out.println("Using -mmacosx-version-min=" + min);
             }
         }
     }