From e5d1244a747a3863b9f53c80c3ad3f0d60fbe8cd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 20 Feb 2010 18:13:18 +0100 Subject: libxcb: fix build with Buildroot compiled xsltproc Make sure that libxcb depends on host-xsltproc, since xsltproc is required for the compilation of libxcb. Moreover, remove the XSLTPROC=/usr/bin/xsltproc variable definition, which was assuming that XSLTPROC was installed on the host. xsltproc should just be part of the PATH. Signed-off-by: Thomas Petazzoni --- package/x11r7/libxcb/libxcb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/x11r7') diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk index b79addd20..19cfc6a12 100644 --- a/package/x11r7/libxcb/libxcb.mk +++ b/package/x11r7/libxcb/libxcb.mk @@ -10,9 +10,9 @@ LIBXCB_SITE = http://xcb.freedesktop.org/dist/ LIBXCB_INSTALL_STAGING = YES LIBXCB_AUTORECONF = NO -LIBXCB_DEPENDENCIES = pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau +LIBXCB_DEPENDENCIES = host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)" -LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XSLTPROC=/usr/bin/xsltproc +LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb $(eval $(call AUTOTARGETS,package/x11r7,libxcb)) -- cgit v1.2.3 From 1786b39f0b85f2efa383ca8714ca88fdecafba84 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 20 Feb 2010 18:14:56 +0100 Subject: xapp_mkfontscale: enable compilation for the host and fix deps mkfontscale on the host is required to build xfonts-encoding for the target. We also fix the dependencies. xlib_libX11 is not needed to compile xapp_mkfontscale. However, xproto_xproto is needed. Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package/x11r7') diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk index 05a3f8146..1cbe0b42a 100644 --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk @@ -8,6 +8,8 @@ XAPP_MKFONTSCALE_VERSION = 1.0.5 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_MKFONTSCALE_AUTORECONF = NO -XAPP_MKFONTSCALE_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc +XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto +HOST_XAPP_MKFONTSCALE_DEPENDENCIES = host-zlib host-freetype host-xlib_libfontenc host-xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale)) +$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale,host)) -- cgit v1.2.3 From d61ed6f32207ced6d7afa0d45473b63a0acf248d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 20 Feb 2010 18:15:46 +0100 Subject: xfont_encoding: add mkfontscale on the host as dependency mkfontscale on the host is needed to build xfont_encoding, therefore we add host-xapp_mkfontscale as a dependency. Signed-off-by: Thomas Petazzoni --- package/x11r7/xfont_encodings/xfont_encodings.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'package/x11r7') diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk index 74256d1d1..9097735e8 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.mk +++ b/package/x11r7/xfont_encodings/xfont_encodings.mk @@ -9,5 +9,6 @@ XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_ENCODINGS_AUTORECONF = NO XFONT_ENCODINGS_MAKE_OPT = +XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale $(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings)) -- cgit v1.2.3 From d65e627432af8fce1c41df67ca48ce926b5a7300 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 20 Feb 2010 18:17:43 +0100 Subject: xlib_libfontenc: enable compilation on the host xlib_libfontenc is required to build xapp_mkfontscale on the host, which in turn is needed to build font encodings for the target. Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'package/x11r7') diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk index b03697a8f..7ab451166 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk @@ -12,4 +12,7 @@ XLIB_LIBFONTENC_INSTALL_STAGING = YES XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto XLIB_LIBFONTENC_CONF_OPT = --enable-shared --disable-static +HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto + $(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc)) +$(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc,host)) -- cgit v1.2.3 From abc1479ea795a18a743ea513e33179058bdfe6b6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 20 Feb 2010 18:20:14 +0100 Subject: xfont_font-util: convert to the autotools infrastructure Signed-off-by: Thomas Petazzoni --- package/x11r7/xfont_font-util/xfont_font-util.mk | 74 ++---------------------- 1 file changed, 6 insertions(+), 68 deletions(-) (limited to 'package/x11r7') diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk index 38e7e80a7..88dce3843 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.mk +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk @@ -5,76 +5,14 @@ ################################################################################ XFONT_FONT_UTIL_VERSION = 1.0.1 -XFONT_FONT_UTIL_NAME = font-util-$(XFONT_FONT_UTIL_VERSION) XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_UTIL_AUTORECONF = NO -XFONT_FONT_UTIL_DIR=$(BUILD_DIR)/$(XFONT_FONT_UTIL_NAME) -XFONT_FONT_UTIL_CAT:=$(BZCAT) +XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config -$(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE): - $(call DOWNLOAD,$(XFONT_FONT_UTIL_SITE),$(XFONT_FONT_UTIL_SOURCE)) +define XFONT_FONT_UTIL_POST_INSTALL_FIXES + $(@D)/post-install.sh $(STAGING_DIR) +endef -xfont_font-util-source: $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE) - -$(XFONT_FONT_UTIL_DIR)/.unpacked: $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE) - $(XFONT_FONT_UTIL_CAT) $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(XFONT_FONT_UTIL_DIR) package/x11r7/xfont_font-util/ \*.patch - $(CONFIG_UPDATE) $(XFONT_FONT_UTIL_DIR) - touch $@ - -$(XFONT_FONT_UTIL_DIR)/.configured: $(XFONT_FONT_UTIL_DIR)/.unpacked - (cd $(XFONT_FONT_UTIL_DIR) && rm -rf config.cache) - (cd $(XFONT_FONT_UTIL_DIR) && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --includedir=/usr/include \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - ) - touch $@ - -$(XFONT_FONT_UTIL_DIR)/.compiled: $(XFONT_FONT_UTIL_DIR)/.configured - $(MAKE) -C $(XFONT_FONT_UTIL_DIR) - touch $@ - -$(XFONT_FONT_UTIL_DIR)/.installed: $(XFONT_FONT_UTIL_DIR)/.compiled - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(XFONT_FONT_UTIL_DIR) install - touch $@ - -$(XFONT_FONT_UTIL_DIR)/.hacked: $(XFONT_FONT_UTIL_DIR)/.installed - ( package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR) ) - touch $@ - -xfont_font-util: host-pkg-config $(XFONT_FONT_UTIL_DIR)/.hacked - -xfont_font-util-unpacked: $(XFONT_FONT_UTIL_DIR)/.unpacked - -xfont_font-util-clean: - -$(MAKE) -C $(XFONT_FONT_UTIL_DIR) clean - -xfont_font-util-dirclean: - rm -rf $(XFONT_FONT_UTIL_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_XFONT_FONT_UTIL),y) -TARGETS+=xfont_font-util -endif +XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES +$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util)) \ No newline at end of file -- cgit v1.2.3