fix some fallouts compiling openjdk7 for rpi2 on another buildserver

package/fixesproto/Makefile

@@ -12,10 +12,15 @@ PKG_HASH:=		67865a0e3cdc7dec1fd676f0927f7011ad4036c18eb320a2b41dbd56282f33b8
 PKG_SITES:=		http://www.x.org/releases/individual/proto/
 PKG_OPTS:=              dev devonly
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
+include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FIXESPROTO,fixesproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call HOST_template,FIXESPROTO,fixesproto,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,FIXESPROTO,fixesproto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+HOST_STYLE:=		auto
+
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/libXfixes/Makefile

@@ -10,20 +10,24 @@ PKG_HASH:=		81b692856c0e7ab2778a34a32aa6b3f455b9b58cf388f009cba872ed933ae9c0
 PKG_DESCR:=		x11 fixes library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		fixesproto xextproto xproto libX11
+HOST_BUILDDEP:=		fixesproto-host
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		http://www.x.org/releases/individual/lib/
 PKG_LIBNAME:=		libxfixes
 PKG_OPTS:=		dev
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
+include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXFIXES,libxfixes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call HOST_template,LIBXFIXES,libxfixes,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIBXFIXES,libxfixes,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 libxfixes-install:
 	$(INSTALL_DIR) $(IDIR_LIBXFIXES)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libXfixes*.so* \
 		$(IDIR_LIBXFIXES)/usr/lib
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/libXfixes/patches/patch-src_Xfixesint_h

@@ -0,0 +1,21 @@
+--- libXfixes-5.0.1.orig/src/Xfixesint.h	2013-05-29 06:11:24.000000000 +0200
++++ libXfixes-5.0.1/src/Xfixesint.h	2015-12-31 00:01:21.448241629 +0100
+@@ -60,18 +60,4 @@ XFixesFindDisplay (Display *dpy);
+ #define XFixesSimpleCheckExtension(dpy,i) \
+   if (!XFixesHasExtension(i)) { return; }
+ 
+-#ifndef HAVE__XEATDATAWORDS
+-#include <X11/Xmd.h>  /* for LONG64 on 64-bit platforms */
+-#include <limits.h>
+-
+-static inline void _XEatDataWords(Display *dpy, unsigned long n)
+-{
+-# ifndef LONG64
+-    if (n >= (ULONG_MAX >> 2))
+-        _XIOError(dpy);
+-# endif
+-    _XEatData (dpy, n << 2);
+-}
+-#endif
+-
+ #endif /* _XFIXESINT_H_ */

package/libXi/Makefile

@@ -10,6 +10,7 @@ PKG_HASH:=		4e88fa7decd287e58140ea72238f8d54e4791de302938c83695fc0c9ac102b7e
 PKG_DESCR:=		client interface to the xinput extension
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xproto xextproto libXext libXfixes
+HOST_BUILDDEP:=		libXfixes-host
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		http://www.x.org/releases/individual/lib/
 PKG_LIBNAME:=		libxi

package/libXinerama/patches/patch-src_Xinerama_c

@@ -0,0 +1,23 @@
+--- libXinerama-1.1.3.orig/src/Xinerama.c	2013-05-31 02:28:02.000000000 +0200
++++ libXinerama-1.1.3/src/Xinerama.c	2015-12-31 09:00:56.434764883 +0100
+@@ -35,20 +35,6 @@ Equipment Corporation.
+ #include <X11/extensions/panoramiXproto.h>
+ #include <X11/extensions/Xinerama.h>
+ 
+-#ifndef HAVE__XEATDATAWORDS
+-#include <X11/Xmd.h>  /* for LONG64 on 64-bit platforms */
+-#include <limits.h>
+-
+-static inline void _XEatDataWords(Display *dpy, unsigned long n)
+-{
+-# ifndef LONG64
+-    if (n >= (ULONG_MAX >> 2))
+-        _XIOError(dpy);
+-# endif
+-    _XEatData (dpy, n << 2);
+-}
+-#endif
+-
+ static XExtensionInfo _panoramiX_ext_info_data;
+ static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
+ static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;

package/libXtst/patches/patch-src_XRecord_c

@@ -0,0 +1,20 @@
+--- libXtst-1.2.2.orig/src/XRecord.c	2013-05-31 04:09:49.000000000 +0200
++++ libXtst-1.2.2/src/XRecord.c	2015-12-31 09:10:38.348187290 +0100
+@@ -61,17 +61,6 @@ from The Open Group.
+ #include <X11/extensions/record.h>
+ #include <limits.h>
+ 
+-#ifndef HAVE__XEATDATAWORDS
+-static inline void _XEatDataWords(Display *dpy, unsigned long n)
+-{
+-# ifndef LONG64
+-    if (n >= (ULONG_MAX >> 2))
+-        _XIOError(dpy);
+-# endif
+-    _XEatData (dpy, n << 2);
+-}
+-#endif
+-
+ static XExtensionInfo _xrecord_info_data;
+ static XExtensionInfo *xrecord_info = &_xrecord_info_data;
+ static const char *xrecord_extension_name = RECORD_NAME;

package/openjdk7/patches/openadk.patch

@@ -1,6 +1,6 @@
 diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
---- icedtea-2.6.3.orig/Makefile.in	2015-11-13 07:59:43.000000000 +0100
-+++ icedtea-2.6.3/Makefile.in	2015-12-24 10:20:18.000000000 +0100
+--- icedtea-2.6.3.orig/Makefile.in	2015-11-13 07:59:43.238447031 +0100
++++ icedtea-2.6.3/Makefile.in	2015-12-30 23:44:40.378409714 +0100
 @@ -635,7 +635,6 @@
  STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
  STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
@@ -27,16 +27,17 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
   clean-jconsole-@JAVA_VER@.desktop
  	if [ -e bootstrap ]; then \
  	  rmdir bootstrap ; \
-@@ -1523,7 +1522,7 @@
+@@ -1522,8 +1521,7 @@
+ 	clean-add-systemtap-debug clean-add-systemtap-boot \
  	clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \
  	clean-add-tzdata-support-boot \
- 	clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
+-	clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
 -	clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
 +	clean-add-archive clean-add-archive-debug clean-add-archive-boot \
  	clean-download-hotspot clean-download-corba clean-download-jaxp \
  	clean-download-jaxws clean-download-langtools clean-download-jdk clean-download-openjdk \
  	clean-extract-corba clean-extract-jaxp clean-extract-jaxws clean-extract-jdk \
-@@ -2499,16 +2498,6 @@
+@@ -2499,16 +2497,6 @@
  	fi
  	rm -f stamps/add-tzdata-support.stamp
  
@@ -53,7 +54,7 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
  stamps/add-archive.stamp: stamps/icedtea.stamp
  @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
  @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
-@@ -2605,16 +2594,6 @@
+@@ -2605,16 +2593,6 @@
  	fi
  	rm -f stamps/add-tzdata-support-debug.stamp
  
@@ -70,7 +71,7 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
  stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
  @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \
  @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
-@@ -2647,22 +2626,22 @@
+@@ -2647,22 +2625,22 @@
  
  stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
   stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \
@@ -97,7 +98,7 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
   clean-add-archive-debug clean-split-debuginfo-debug
  	rm -f stamps/icedtea-debug-stage2.stamp
  
-@@ -2727,16 +2706,6 @@
+@@ -2727,16 +2705,6 @@
  	fi
  	rm -f stamps/add-tzdata-support-boot.stamp
  
@@ -114,7 +115,23 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
  stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp
  @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \
  @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
-@@ -2855,7 +2824,7 @@
+@@ -2769,13 +2737,13 @@
+ 
+ stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \
+  stamps/add-systemtap-boot.stamp stamps/add-tzdata-support-boot.stamp \
+- stamps/check-crypto-boot.stamp stamps/add-archive-boot.stamp \
++ stamps/add-archive-boot.stamp \
+  stamps/split-debuginfo-boot.stamp
+ 	mkdir -p stamps
+ 	touch $@
+ 
+ clean-icedtea-stage1: clean-add-systemtap-boot clean-add-tzdata-support-boot \
+- clean-check-crypto-boot clean-add-archive-boot clean-split-debuginfo-boot
++ clean-add-archive-boot clean-split-debuginfo-boot
+ 	rm -f stamps/icedtea-stage1.stamp
+ 
+ # Rebuild targets
+@@ -2855,7 +2823,7 @@
  stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
  @BUILD_JAMVM_TRUE@	cd jamvm/jamvm && \
  @BUILD_JAMVM_TRUE@	./autogen.sh --with-java-runtime-library=openjdk7 \
@@ -123,7 +140,7 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
  @BUILD_JAMVM_TRUE@	$(MAKE) ; \
  @BUILD_JAMVM_TRUE@	$(MAKE) install
  @BUILD_JAMVM_TRUE@	mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
-@@ -3196,19 +3165,6 @@
+@@ -3196,19 +3164,6 @@
  	  chmod u+w $(STAGE1_BOOT_RUNTIME) ; \
  	fi
  
@@ -143,7 +160,7 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
  # File substitution
  
  policytool-@JAVA_VER@.desktop: policytool.desktop
-@@ -3230,7 +3186,6 @@
+@@ -3230,7 +3185,6 @@
  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt}
  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext
@@ -151,7 +168,7 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
  @SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/$(bindir) $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib
  @SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
  @SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
-@@ -3328,9 +3283,6 @@
+@@ -3328,9 +3282,6 @@
  	for files in $(BUILD_SDK_DIR)/jre/lib/ext/*.jar; do \
  	  $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/ext,$(INSTALL_DATA));\
  	done
@@ -161,8 +178,16 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
  	$(abs_top_builddir)/pax-mark-vm $(DESTDIR)${prefix}
  
  install-data-local:
-@@ -3494,8 +3446,6 @@
+@@ -3486,16 +3437,8 @@
  
+ cacao: stamps/cacao.stamp
+ 
+-check-crypto: stamps/check-crypto.stamp
+-
+-check-crypto-boot: stamps/check-crypto-boot.stamp
+-
+-check-crypto-debug: stamps/check-crypto-debug.stamp
+-
  clone-boot: stamps/clone-boot.stamp
  
 -cryptocheck: stamps/cryptocheck.stamp
@@ -172,7 +197,7 @@ diff -Nur icedtea-2.6.3.orig/Makefile.in icedtea-2.6.3/Makefile.in
  download-cacao: stamps/download-cacao.stamp
 diff -Nur icedtea-2.6.3.orig/patches/openadk.patch icedtea-2.6.3/patches/openadk.patch
 --- icedtea-2.6.3.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.6.3/patches/openadk.patch	2015-12-24 00:13:40.000000000 +0100
++++ icedtea-2.6.3/patches/openadk.patch	2015-12-30 23:39:55.373247806 +0100
 @@ -0,0 +1,1424 @@
 +diff -Nur openjdk.orig/corba/make/common/shared/Defs-utils.gmk openjdk/corba/make/common/shared/Defs-utils.gmk
 +--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk	2015-11-13 05:54:57.000000000 +0100