From 3817bc280e583bcd21c894879ab23cc75c8fe87f Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Sun, 11 Mar 2012 17:46:36 -0600
Subject: [PATCH] heretofore untested iOS OpenJDK support

---
 makefile                           | 48 ++++++++++++++++++++++++++++++
 openjdk-src.mk                     | 11 +++++--
 src/openjdk/my_java_props_macosx.c | 28 +++++++++++++++++
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 src/openjdk/my_java_props_macosx.c

diff --git a/makefile b/makefile
index 636bbf2147..64429c1725 100755
--- a/makefile
+++ b/makefile
@@ -990,6 +990,18 @@ $(openjdk-objects): $(build)/openjdk/%-openjdk.o: $(openjdk-src)/%.c \
 	@echo "compiling $(@)"
 	@mkdir -p $(dir $(@))
 	sed 's/^static jclass ia_class;//' < $(<) > $(build)/openjdk/$(notdir $(<))
+ifeq ($(ios),true)
+	sed \
+		-e 's/^#ifndef __APPLE__/#if 1/' \
+		-e 's/^#ifdef __APPLE__/#if 0/' \
+		< "$(openjdk-src)/solaris/native/java/lang/ProcessEnvironment_md.c" \
+		> $(build)/openjdk/ProcessEnvironment_md.c
+	sed \
+		-e 's/^#ifndef __APPLE__/#if 1/' \
+		-e 's/^#ifdef __APPLE__/#if 0/' \
+		< "$(openjdk-src)/solaris/native/java/lang/UNIXProcess_md.c" \
+		> $(build)/openjdk/UNIXProcess_md.c
+endif
 	$(cc) -fPIC $(openjdk-extra-cflags) $(openjdk-cflags) \
 		$(optimization-cflags) -w -c $(build)/openjdk/$(notdir $(<)) \
 		$(call output,$(@))
@@ -1020,6 +1032,42 @@ ifeq ($(platform),windows)
 		< "$(openjdk-src)/windows/native/java/net/NetworkInterface.h" \
 		> $(build)/openjdk/NetworkInterface.h
 	echo 'static int getAddrsFromAdapter(IP_ADAPTER_ADDRESSES *ptr, netaddr **netaddrPP);' >> $(build)/openjdk/NetworkInterface.h
+endif
+ifeq ($(platform),darwin)
+	mkdir -p $(build)/openjdk/netinet
+	for file in \
+		/usr/include/netinet/ip.h \
+		/usr/include/netinet/in_systm.h \
+		/usr/include/netinet/ip_icmp.h \
+		/usr/include/netinet/in_var.h \
+		/usr/include/netinet/icmp6.h \
+		/usr/include/netinet/ip_var.h; do \
+		if [ ! -f "$(build)/openjdk/netinet/$$(basename $${file})" ]; then \
+			ln "$${file}" "$(build)/openjdk/netinet/$$(basename $${file})"; \
+		fi; \
+	done
+	mkdir -p $(build)/openjdk/netinet6
+	for file in \
+		/usr/include/netinet6/in6_var.h; do \
+		if [ ! -f "$(build)/openjdk/netinet6/$$(basename $${file})" ]; then \
+			ln "$${file}" "$(build)/openjdk/netinet6/$$(basename $${file})"; \
+		fi; \
+	done
+	mkdir -p $(build)/openjdk/net
+	for file in \
+		/usr/include/net/if_arp.h; do \
+		if [ ! -f "$(build)/openjdk/net/$$(basename $${file})" ]; then \
+			ln "$${file}" "$(build)/openjdk/net/$$(basename $${file})"; \
+		fi; \
+	done
+	mkdir -p $(build)/openjdk/sys
+	for file in \
+		/usr/include/sys/kern_event.h \
+		/usr/include/sys/sys_domain.h; do \
+		if [ ! -f "$(build)/openjdk/sys/$$(basename $${file})" ]; then \
+			ln "$${file}" "$(build)/openjdk/sys/$$(basename $${file})"; \
+		fi; \
+	done
 endif
 	@touch $(@)
 
diff --git a/openjdk-src.mk b/openjdk-src.mk
index dfe455b4bb..6735471fea 100644
--- a/openjdk-src.mk
+++ b/openjdk-src.mk
@@ -317,15 +317,22 @@ else
 
 	ifeq ($(platform),darwin)
 		openjdk-sources += \
-			$(openjdk-src)/solaris/native/java/lang/java_props_macosx.c \
 			$(openjdk-src)/solaris/native/java/net/bsd_close.c
 
+		ifeq ($(ios),true)
+			openjdk-local-sources += \
+				$(src)/openjdk/my_java_props_macosx.c
+		else
+			openjdk-sources += \
+				$(openjdk-src)/solaris/native/java/lang/java_props_macosx.c
+		endif
+
 		openjdk-cflags += \
 			-DMACOSX
 	endif
 endif
 
-openjdk-local-sources = \
+openjdk-local-sources += \
 	$(src)/openjdk/my_net_util.c \
 	$(src)/openjdk/my_management.c
 
diff --git a/src/openjdk/my_java_props_macosx.c b/src/openjdk/my_java_props_macosx.c
new file mode 100644
index 0000000000..8a1850010f
--- /dev/null
+++ b/src/openjdk/my_java_props_macosx.c
@@ -0,0 +1,28 @@
+#include "java_props_macosx.h"
+
+PreferredToolkit
+getPreferredToolkit()
+{
+  return unset;
+}
+
+void
+setOSNameAndVersion(java_props_t* props)
+{
+  props->os_name = strdup("iOS");
+  props->os_version = strdup("Unknown");
+}
+
+void
+setProxyProperties(java_props_t* props)
+{
+  // ignore
+}
+
+char*
+setupMacOSXLocale(int cat)
+{
+  return 0;
+}
+
+char* environ[0];