From: Peter Korsgaard Date: Mon, 10 May 2010 20:18:44 +0000 (+0200) Subject: libxcb: relax host-python regexp X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45ca86d4e9f0ac754482bf250c3ef5805e3198ca;p=buildroot.git libxcb: relax host-python regexp Some python versions print x.y rather than x.y.z as version number, so make regexp more robust. Reported-by: Paulius Zaleckas Signed-off-by: Peter Korsgaard --- diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk index c8b70ea18d..4f9b3233cc 100644 --- a/package/x11r7/libxcb/libxcb.mk +++ b/package/x11r7/libxcb/libxcb.mk @@ -13,7 +13,7 @@ LIBXCB_AUTORECONF = NO LIBXCB_LIBTOOL_PATCH = NO LIBXCB_DEPENDENCIES = host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)" -HOST_PYTHON_VERSION=$(shell python --version 2>&1 | sed 's/Python \(2\.[0-9]\)\..*/\1/') +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 $(eval $(call AUTOTARGETS,package/x11r7,libxcb))