summaryrefslogtreecommitdiff
path: root/package/openjdk7
diff options
context:
space:
mode:
Diffstat (limited to 'package/openjdk7')
-rw-r--r--package/openjdk7/Makefile8
-rw-r--r--package/openjdk7/patches/mips64el.patch15
2 files changed, 20 insertions, 3 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 80e387d17..231892b42 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -38,10 +38,12 @@ TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS))
TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
BOOTSTRAPJDK:= ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk
+JDKARCH:= $(ARCH)
ifeq ($(ARCH),x86)
JDKARCH:= i386
-else
-JDKARCH:= $(ARCH)
+endif
+ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
+JDKARCH:= mipsel
endif
ifeq ($(ADK_PACKAGE_OPENJDK7_ZERO),y)
@@ -87,7 +89,7 @@ MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
- GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH)
+ GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU)
ALL_TARGET:= icedtea
diff --git a/package/openjdk7/patches/mips64el.patch b/package/openjdk7/patches/mips64el.patch
new file mode 100644
index 000000000..501167582
--- /dev/null
+++ b/package/openjdk7/patches/mips64el.patch
@@ -0,0 +1,15 @@
+diff -Nur icedtea-2.3.9.orig/configure icedtea-2.3.9/configure
+--- icedtea-2.3.9.orig/configure 2013-04-21 22:48:30.000000000 +0200
++++ icedtea-2.3.9/configure 2013-05-13 12:43:02.000000000 +0200
+@@ -7159,6 +7159,11 @@
+ INSTALL_ARCH_DIR=mipsel
+ JRE_ARCH_DIR=mipsel
+ ;;
++ mips64el)
++ BUILD_ARCH_DIR=mipsel
++ INSTALL_ARCH_DIR=mipsel
++ JRE_ARCH_DIR=mipsel
++ ;;
+ powerpc)
+ BUILD_ARCH_DIR=ppc
+ INSTALL_ARCH_DIR=ppc