From b071050b9eda9d5e5185e582dbe9f4adba863ccc Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 18 Jun 2013 08:23:14 +0200 Subject: libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013 libxcb/xcb-proto commit e5f7c750815cb5170db363a2e5b09639b7354733 xkeyboard-config commit 30d804538462213ed01e8efc0b44a8e5a0aff990 libX11 commit 9dfb0f3c0a761590bcdc1f3396b1e064da4e18e8 pixman commit 279bdcda7ec3af8ac06312f4514b1b082a279544 mkfontscale commit f731c5c36f28ddd0f25f474d2991c96f9a7a915c libXmu commit e46ecb4e02b7f919b11efa79448d4db71d1deb69 mesa commit eb2021507556633cd6ba64cda26653e3c43e80df --- mesalib/scons/custom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesalib/scons/custom.py') diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py index 658df9782..39a5333fd 100644 --- a/mesalib/scons/custom.py +++ b/mesalib/scons/custom.py @@ -95,7 +95,7 @@ def createConvenienceLibBuilder(env): # TODO: handle import statements with multiple modules # TODO: handle from import statements -import_re = re.compile(r'^import\s+(\S+)$', re.M) +import_re = re.compile(r'^\s*import\s+(\S+)\s*$', re.M) def python_scan(node, env, path): # http://www.scons.org/doc/0.98.5/HTML/scons-user/c2781.html#AEN2789 @@ -113,6 +113,7 @@ def python_scan(node, env, path): if os.path.exists(file): results.append(env.File(file)) break + #print node, map(str, results) return results python_scanner = SCons.Scanner.Scanner(function = python_scan, skeys = ['.py']) -- cgit v1.2.3