From bf49e3afac13e7a7a52eb383b914ac49def2edb4 Mon Sep 17 00:00:00 2001 From: brook Date: Sat, 21 Jan 2017 17:10:26 +0000 Subject: Always take the flex version from the second word of the version string. When necessary, the flex version is obtained from the version string reported by running flex. Generally, the first word of the version string is flex and and the second is a version number. At least for MacOS, there is a third vendor-specific word. The sed command previously used to capture the flex version captured the last word, not the second one, because the first capture group was too greedy and could capture more than a single word. Instead, force the capture groups to capture only words, i.e., no blanks, and use the second word for the version. --- mk/tools/flex.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/tools/flex.mk b/mk/tools/flex.mk index 5a609758e8f..545c31bd61c 100644 --- a/mk/tools/flex.mk +++ b/mk/tools/flex.mk @@ -1,4 +1,4 @@ -# $NetBSD: flex.mk,v 1.1 2011/11/26 14:58:45 hans Exp $ +# $NetBSD: flex.mk,v 1.2 2017/01/21 17:10:26 brook Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -47,7 +47,7 @@ FLEX_REQD?= 2.5.4 . if !defined(_TOOLS_USE_PKGSRC.flex) _TOOLS_VERSION.flex!= \ ${TOOLS_PLATFORM.flex} --version | \ - ${SED} -e 's/\(.*\) \(.*\)$$/\2/' + ${SED} -e 's/^[[:blank:]]*\([^[:blank:]]\{1,\}\)[[:blank:]]\{1,\}\([^[:blank:]]\{1,\}\).*$$/\2/' _TOOLS_PKG.flex= flex-${_TOOLS_VERSION.flex} _TOOLS_USE_PKGSRC.flex= no . for _dep_ in flex>=${FLEX_REQD} -- cgit v1.2.3