diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 10:47:31 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 10:47:31 +0100 |
| commit | 4b7a7c1333333ce0f1567cfda15fb86222be2301 (patch) | |
| tree | 52ca6663c6c95635d7afa18c3cf750280b498c62 /package/libX11 | |
| parent | e31358b57662bb44613874e6cb5d5569309910af (diff) | |
| parent | 103810049b157dc809c82a0136e23fe4276b9750 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/pulseaudio/Makefile
Diffstat (limited to 'package/libX11')
| -rw-r--r-- | package/libX11/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 78078cf83..8ab881ec2 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -9,7 +9,9 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 395455e4d3a51459374fe5ca8420aae8 PKG_DESCR:= X11 client-side library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xproto-host +PKG_BUILDDEP:= xproto-host xextproto-host libXau-host libpthread-stubs-host +PKG_BUILDDEP+= xcb-proto-host libxcb-host kbproto-host +PKG_BUILDDEP+= inputproto-host xtrans-host libX11-host PKG_BUILDDEP+= xproto xextproto xtrans libXdmcp libXau xcb-proto PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto libxcb PKG_DEPENDS:= libxdmcp libxcb libxau @@ -21,14 +23,18 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --enable-xlocale \ --disable-specs \ --disable-xf86bigfont \ --disable-malloc0returnsnull +HOST_CONFIGURE_ARGS+= $(CONFIGURE_ARGS) libx11-install: ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 @@ -37,4 +43,5 @@ libx11-install: ${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11 ${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11 +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk |