summaryrefslogtreecommitdiff
path: root/package/openjdk7
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-31 17:27:48 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-31 17:27:48 +0100
commit1dca0c28b1d70a82fcfd15f11b8cd1f52761ad2c (patch)
tree73bac23a9800eeaf281a60ccf7fd01123a536e5c /package/openjdk7
parentbc77b8037f471907136351867d1c88a6e92b3aee (diff)
parentf5ce6f0a51261cc405556467632aac0ddc77f74c (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk7')
-rw-r--r--package/openjdk7/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index bdb34b0f0..ca9e416a5 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= lang
PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host
PKG_BUILDDEP+= fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host
PKG_BUILDDEP+= xineramaproto-host libXinerama-host recordproto-host libXi-host libXtst-host freetype-host
-PKG_BUILDDEP+= alsa-lib-host libffi-host gcj-host ecj-host jikes-host
+PKG_BUILDDEP+= renderproto-host libXrender-host alsa-lib-host libffi-host gcj-host ecj-host jikes-host
PKG_BUILDDEP+= classpath-host jamvm-host ant-host cups-host openjdk7-host
PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
@@ -101,7 +101,9 @@ OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_
OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj
OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip"
OPENJDK_NATIVE_ENV+= FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
- ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include"
+ ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \
+ ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include"
+
HOST_STYLE:= auto
HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV)