diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-25 16:30:37 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-25 16:30:37 +0100 |
commit | 13f60ace523c24e2c4cc3db7635171318dc21b82 (patch) | |
tree | 6297b313f191724c9c6e8ed015f24738d38f0d23 /package/openjdk7/Makefile | |
parent | f5dacefc3b41877ad9c2839c9dbc84ec808f7a03 (diff) | |
parent | 26a11df04e2c0842501fe9c1ece23cee8c632f97 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk7/Makefile')
-rw-r--r-- | package/openjdk7/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 60615faca..89d0a0600 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -13,7 +13,7 @@ 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+= classpath-host jamvm-host ant-host openjdk7-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 PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc @@ -113,7 +113,8 @@ OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$ OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 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)" +OPENJDK_NATIVE_ENV+= FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ + ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" HOST_STYLE:= auto HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV) |