summaryrefslogtreecommitdiffstats
path: root/scripts/lib/recipetool
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-03-09 17:48:48 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 17:00:29 +0000
commit1607fac5210437dd13a96017dc65c5f2f46dbf65 (patch)
tree5458b7b99de05bd2586556e6857084f3f26515d7 /scripts/lib/recipetool
parent9dca5c84264aef3b63cf67a1975368052dce7a35 (diff)
downloadpoky-1607fac5210437dd13a96017dc65c5f2f46dbf65.tar.gz
recipetool: create: be more tolerant of spacing in configure.ac
Allow for whitespace in appropriate places, and ensure we match all whitespace chars not just the space character. (This fixes extracting dependencies from tmux's configure.ac, for example.) (From OE-Core rev: 63524ac8093b734aa4f29f4ea47bcc036f748314) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/recipetool')
-rw-r--r--scripts/lib/recipetool/create_buildsys.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/lib/recipetool/create_buildsys.py b/scripts/lib/recipetool/create_buildsys.py
index 0228269cf9..909743b384 100644
--- a/scripts/lib/recipetool/create_buildsys.py
+++ b/scripts/lib/recipetool/create_buildsys.py
@@ -413,15 +413,15 @@ class AutotoolsRecipeHandler(RecipeHandler):
413 progclassmap = {'gconftool-2': 'gconf', 413 progclassmap = {'gconftool-2': 'gconf',
414 'pkg-config': 'pkgconfig'} 414 'pkg-config': 'pkgconfig'}
415 415
416 pkg_re = re.compile('PKG_CHECK_MODULES\(\[?[a-zA-Z0-9_]*\]?, *\[?([^,\]]*)\]?[),].*') 416 pkg_re = re.compile('PKG_CHECK_MODULES\(\s*\[?[a-zA-Z0-9_]*\]?,\s*\[?([^,\]]*)\]?[),].*')
417 pkgce_re = re.compile('PKG_CHECK_EXISTS\(\[?([^,\]]*)\]?[),].*') 417 pkgce_re = re.compile('PKG_CHECK_EXISTS\(\s*\[?([^,\]]*)\]?[),].*')
418 lib_re = re.compile('AC_CHECK_LIB\(\[?([^,\]]*)\]?,.*') 418 lib_re = re.compile('AC_CHECK_LIB\(\s*\[?([^,\]]*)\]?,.*')
419 libx_re = re.compile('AX_CHECK_LIBRARY\(\[?[^,\]]*\]?, *\[?([^,\]]*)\]?, *\[?([a-zA-Z0-9-]*)\]?,.*') 419 libx_re = re.compile('AX_CHECK_LIBRARY\(\s*\[?[^,\]]*\]?,\s*\[?([^,\]]*)\]?,\s*\[?([a-zA-Z0-9-]*)\]?,.*')
420 progs_re = re.compile('_PROGS?\(\[?[a-zA-Z0-9_]*\]?, \[?([^,\]]*)\]?[),].*') 420 progs_re = re.compile('_PROGS?\(\s*\[?[a-zA-Z0-9_]*\]?,\s*\[?([^,\]]*)\]?[),].*')
421 dep_re = re.compile('([^ ><=]+)( [<>=]+ [^ ><=]+)?') 421 dep_re = re.compile('([^ ><=]+)( [<>=]+ [^ ><=]+)?')
422 ac_init_re = re.compile('AC_INIT\(([^,]+), *([^,]+)[,)].*') 422 ac_init_re = re.compile('AC_INIT\(\s*([^,]+),\s*([^,]+)[,)].*')
423 am_init_re = re.compile('AM_INIT_AUTOMAKE\(([^,]+), *([^,]+)[,)].*') 423 am_init_re = re.compile('AM_INIT_AUTOMAKE\(\s*([^,]+),\s*([^,]+)[,)].*')
424 define_re = re.compile(' *(m4_)?define\(([^,]+), *([^,]+)\)') 424 define_re = re.compile('\s*(m4_)?define\(\s*([^,]+),\s*([^,]+)\)')
425 425
426 defines = {} 426 defines = {}
427 def subst_defines(value): 427 def subst_defines(value):