honour target cflags/cxxflags, add explizit search paths for headers and library for non-sysroot toolchains

package/openjdk/Makefile

@@ -98,7 +98,10 @@ CONFIGURE_ENV+=		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET
 MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
 			ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
 			PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
+			OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
+			OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
 			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH)
+
 ALL_TARGET:=		icedtea
 
 # add include path for Xrender.h from staging directory
@@ -107,6 +110,7 @@ ifeq ($(QEMU),)
 	$(error Fatal error: $$QEMU not set!)
 endif
 	$(SED) "s#@ADK_TARGETDIR@#$(STAGING_TARGET_DIR)#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/sun/xawt/Makefile
+	$(SED) "s#OTHER_CXXFLAGS#CXXFLAGS_COMMON#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/com/sun/java/pack/Makefile
 
 do-extract:
 	cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \

package/openjdk/patches/cxxflags-nozlib.patch

@@ -0,0 +1,31 @@
+--- w-openjdk-6.orig/icedtea6-1.10/patches/libraries.patch	2011-02-23 23:32:34.602901049 +0100
++++ w-openjdk-6/icedtea6-1.10/patches/libraries.patch	2011-08-24 15:07:24.347475241 +0200
+@@ -24648,7 +24648,7 @@
+ -	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+ -
+ -  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+--  OTHER_CXXFLAGS += $(ZINCLUDE)
++-  CXXFLAGS_COMMON += $(ZINCLUDE)
+ -  LDDFLAGS += $(ZIPOBJS)
+ +            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
+ +            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
+@@ -24663,7 +24663,7 @@
+ +
+ +  OTHER_LDLIBS += -lz
+  else
+-   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
++   CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
+ -  OTHER_LDLIBS += $(JVMLIB)
+ +  OTHER_LDLIBS += -lz $(JVMLIB)
+  endif
+--- w-openjdk-6.orig/icedtea6-1.10/patches/linker-libs-order.patch	2011-02-23 23:32:34.653236038 +0100
++++ w-openjdk-6/icedtea6-1.10/patches/linker-libs-order.patch	2011-08-24 15:53:05.047474381 +0200
+@@ -31,7 +31,7 @@
+  
+ -  OTHER_LDLIBS += -lz
+  else
+-   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
++   CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
+ -  OTHER_LDLIBS += -lz $(JVMLIB)
+ +  OTHER_LDLIBS += $(JVMLIB)
+  endif