From 422263f499c3d17166c9563da7b34095b0d18521 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Tue, 22 Feb 2011 15:45:46 -0700
Subject: [PATCH] fix Mac OS PowerPC cross build

While we can use Linux's jni.h to cross compile the i386 Mac OS build,
that doesn't work for the PowerPC one.  Now we use the proper
/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/jni.h
from the sysroot instead.
---
 makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/makefile b/makefile
index 811a14ceb4..ccd6c8ada9 100644
--- a/makefile
+++ b/makefile
@@ -219,13 +219,14 @@ ifeq ($(platform),darwin)
 		ar = i686-apple-darwin8-ar
 		ranlib = i686-apple-darwin8-ranlib
 		strip = i686-apple-darwin8-strip
-		extra-cflags = -I$(JAVA_HOME)/include/linux
+		sysroot = /opt/mac/SDKs/MacOSX10.4u.sdk
+		cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
+			$(common-cflags) -fPIC -fvisibility=hidden -I$(src)
 	else
+		build-cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
 		build-lflags += -framework CoreFoundation
 	endif
 
-	build-cflags = $(common-cflags) $(extra-cflags) -fPIC -fvisibility=hidden \
-		-I$(src)
 	version-script-flag =
 	lflags = $(common-lflags) -ldl -framework CoreFoundation \
 		-framework CoreServices