diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-31 14:07:14 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-31 14:07:20 +0100 |
| commit | 18ff7b7ff82290dca6f1dd943157fcadb00fb321 (patch) | |
| tree | 7d5bfb2080affdad719f6b5e6af79fbde0d845a1 /package/libXfixes | |
| parent | 9663d8c140c0f78fddcbaa6feb1d706aca7fd95f (diff) | |
fix some fallouts compiling openjdk7 for rpi2 on another buildserver
Diffstat (limited to 'package/libXfixes')
| -rw-r--r-- | package/libXfixes/Makefile | 10 | ||||
| -rw-r--r-- | package/libXfixes/patches/patch-src_Xfixesint_h | 21 |
2 files changed, 28 insertions, 3 deletions
diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile index 402fa05af..2c8fe9631 100644 --- a/package/libXfixes/Makefile +++ b/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 diff --git a/package/libXfixes/patches/patch-src_Xfixesint_h b/package/libXfixes/patches/patch-src_Xfixesint_h new file mode 100644 index 000000000..bb17cef2c --- /dev/null +++ b/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_ */ |