Skip to contentSkip to conversation

xlib_libX11: don't build docs for host

PATCH New Vasily Khoruzhick 2 participants 4 messages May 16, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 xlib_libX11: don't build docs for host

It depends on utils provided by host system, and
they sometimes are missing.

---
 package/x11r7/xlib_libX11/xlib_libX11.mk |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
package/x11r7/xlib_libX11/xlib_libX11.mk +3 -0
index 1acc35c..7ecc368 100644
@@ -18,6 +18,9 @@ XLIB_LIBX11_CONF_OPT = \
 	--with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h \
 	--disable-specs
 
+HOST_XLIB_LIBX11_CONF_OPT = \
+	--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
 
 # src/util/makekeys is executed at build time to generate ks_tables.h, so
Signature · 1 line
1.7.5.rc1
#1 lore raw

PATCH 2/3 font-misc-misc: Don't pull fonts encodings from host system

Use encodings from staging dir.

---
 .../xfont_font-misc-misc/xfont_font-misc-misc.mk   |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +6 -0
index f6a5564..884f6f9 100644
@@ -12,5 +12,11 @@ XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+define XFONT_FONT_MISC_MISC_MAPFILES_PATH_FIX
+	$(SED) 's|UTIL_DIR = |UTIL_DIR = ${STAGING_DIR}|;' $(@D)/Makefile
+endef
+
+XFONT_FONT_MISC_MISC_POST_CONFIGURE_HOOKS += XFONT_FONT_MISC_MISC_MAPFILES_PATH_FIX
+
 $(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-misc))
 
Signature · 1 line
1.7.5.rc1
#2 lore raw

PATCH 3/3 xlib_libXfont: don't build devel documentation for host

In reply to Vasily Khoruzhick
---
 package/x11r7/xlib_libXfont/xlib_libXfont.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/x11r7/xlib_libXfont/xlib_libXfont.mk +1 -0
index 3cb52c3..a91999c 100644
@@ -12,6 +12,7 @@ XLIB_LIBXFONT_INSTALL_STAGING = YES
 XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
 XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static --disable-devel-docs
 
+HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 HOST_XLIB_LIBXFONT_DEPENDENCIES = host-freetype host-xlib_libfontenc host-xlib_xtrans host-xproto_fontcacheproto host-xproto_fontsproto host-xproto_xproto host-xfont_encodings
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfont))
Signature · 1 line
1.7.5.rc1
#3 lore raw

PATCH 1/3 xlib_libX11: don't build docs for host

In reply to Vasily Khoruzhick
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Vasily" == Vasily Khoruzhick <[email protected]> writes:

Vasily> It depends on utils provided by host system, and Vasily> they sometimes are missing.

Committed all 3, thanks.

Signature · 1 line
Bye, Peter Korsgaard