From 597ca4669b46029b13bcd79c37a7cdb3adf357cf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 24 Jan 2014 18:14:45 +0100
Subject: fix cups header dependency, need to rework cups package later, update
to latest upstream
---
package/openjdk7/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'package/openjdk7')
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 292ae8553..e54407913 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 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)
--
cgit v1.2.3