xkeyboard-config: add dependency on host-xapp_xkbcomp

In order to get xkeyboard-config to build, it needs xkbcomp to be
built on the host, i.e host-xapp_xkbcomp. In turn, xapp_xkbcomp needs
xlib_libX11 and xlib_libxkbfile, which in turn need a few libraries.

This commit adds all the relevant dependencies to build everything
that is needed to get xkeyboard-config to build correctly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 4f9b3233ccf0a6a9e02225003bc943a0f4abde92..bfeceab4423721d3dad8febb42710fd141b1d66c 100644 (file)
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -16,5 +16,8 @@ LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
 HOST_PYTHON_VERSION=$(shell python --version 2>&1 | sed 's/Python \([0-9]\.[^\.]\).*/\1/')
 LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XCBPROTO_XCBPYTHONDIR=$(STAGING_DIR)/usr/lib/python$(HOST_PYTHON_VERSION)/site-packages
 
+HOST_LIBXCB_DEPENDENCIES = host-libxslt host-pthread-stubs host-xcb-proto host-xlib_libXdmcp host-xlib_libXau
+
 $(eval $(call AUTOTARGETS,package/x11r7,libxcb))
+$(eval $(call AUTOTARGETS,package/x11r7,libxcb,host))
 

diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
index f40332a970f57b5a17dfa1c1b62f6e076f9eb0d5..3ee7ec1d0340c930e4237ad898fafb3de4795df9 100644 (file)
--- a/package/x11r7/pthread-stubs/pthread-stubs.mk
+++ b/package/x11r7/pthread-stubs/pthread-stubs.mk
@@ -11,4 +11,5 @@ PTHREAD_STUBS_LIBTOOL_PATCH = NO
 PTHREAD_STUBS_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs))
+$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs,host))
 

diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 6082c562293d7242e4fe7660145032f80abde69d..e9f7174a8785c68f7d56e7f5991dd89d344b5b77 100644 (file)
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -9,5 +9,7 @@ XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_AUTORECONF = NO
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
+HOST_XAPP_XKBCOMP_DEPENDENCIES = host-xlib_libX11 host-xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp,host))

diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index a3d029c1ba31d11a2330472033d7fb6978fbce82..153cc0d6f3c5678cab8790df45f77a0948d46385 100644 (file)
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -10,4 +10,5 @@ XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/
 XCB_PROTO_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS,package/x11r7,xcb-proto))
+$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto,host))
 

diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index eb790b87712e96ecbca2ed1b71cac4d82e885a1f..e398d30bb58664d20058057dc17356f0b239cb67 100644 (file)
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -10,7 +10,7 @@ XKEYBOARD_CONFIG_AUTORECONF = NO
 XKEYBOARD_CONFIG_INSTALL_STAGING = NO
 XKEYBOARD_CONFIG_INSTALL_TARGET = YES
 XKEYBOARD_CONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool
+XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
 
 XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
 

diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index b9c18d060b94dbe27142e0bc10d32be09b92c17c..575aa6747292c6f4e958db1d14f1d795bc07c4bb 100644 (file)
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -18,7 +18,10 @@ XLIB_LIBX11_CONF_OPT = \
        --with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h \
        --disable-specs
 
+HOST_XLIB_LIBX11_DEPENDENCIES = host-xproto_xextproto host-libxcb host-xutil_util-macros host-xlib_xtrans host-xlib_libXau host-xlib_libXdmcp host-xproto_kbproto host-xproto_xproto host-xproto_xextproto host-xproto_inputproto host-xproto_xf86bigfontproto xproto_bigreqsproto host-xproto_xcmiscproto
+
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11,host))
 
 # src/util/makekeys is executed at build time to generate ks_tables.h, so
 # it should get compiled for the host. The libX11 makefile unfortunately

diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index d5f68145bd5c3fa3e3c15db5cfb62e14e094af85..ad6a0e5057f93516ae31d0f2c3cf908b5f7a6c5f 100644 (file)
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -13,4 +13,8 @@ XLIB_LIBXAU_INSTALL_STAGING = YES
 XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
 XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
 
+HOST_XLIB_LIBXAU_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
+HOST_XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
+
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau,host))

diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 40b805824e1fefd628203a1be8c0ba2e731c3668..eef3a5e8dfcadd9061d5fc9e75bb85f0e5c7fc75 100644 (file)
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -13,4 +13,8 @@ XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
 XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static
 
+HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
+HOST_XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static
+
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp,host))

diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index 7b6de7e7840b25e3b75bd74c792557b83fa83b23..e71b36b83aaf3ee9e24e081a0fc45edae7a6d55f 100644 (file)
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -12,4 +12,8 @@ XLIB_LIBXKBFILE_INSTALL_STAGING = YES
 XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
 XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static
 
+HOST_XLIB_LIBXKBFILE_DEPENDENCIES = host-xlib_libX11 host-xproto_kbproto
+HOST_XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static
+
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile,host))

diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index d83ba7e39064edbf3de6b0bf154dad5dbff89510..825ebed4c4b468270cb11e41633fc85b468ecacd 100644 (file)
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -12,3 +12,4 @@ XPROTO_INPUTPROTO_INSTALL_STAGING = YES
 XPROTO_INPUTPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto,host))

diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index 802bae474aa991897cd0cccc5dad58a3aecbd497..ecdabf127d9d7f71855465f95b7988e31ce329e5 100644 (file)
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -12,3 +12,4 @@ XPROTO_KBPROTO_INSTALL_STAGING = YES
 XPROTO_KBPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto,host))

diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index 9c85d9fd393da81e6bcacc174e23d9a11bc7038b..1846f200433a584b43d62787ea361fce52e0fc24 100644 (file)
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -12,3 +12,4 @@ XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
 XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto,host))

diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index 6b880b4d7ccb0288c339f1b26bed2568cfc575f1..1fd39c91d64c79c4506320ff5f59224dea1dd1d2 100644 (file)
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -12,3 +12,4 @@ XPROTO_XEXTPROTO_INSTALL_STAGING = YES
 XPROTO_XEXTPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto,host))

diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
index fda78e24f562ca7b34129c0d0f8984419bcef47a..1872873b5649e56e8b4a2560a11b0242f3c81cb2 100644 (file)
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -12,3 +12,4 @@ XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
 XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto,host))

diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index 648136ecd0ee37ead70216542462cda2fab164d2..b600a469421bc0b68246353e9a4b3d690599ec69 100644 (file)
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -12,3 +12,4 @@ XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
 XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros))
+$(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros,host))