diff options
author | Robin Gareus <robin@gareus.org> | 2017-09-20 14:06:04 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-09-20 14:06:27 +0200 |
commit | 3a5f98ba654b1064a07e57e3a4597e0ad49dee26 (patch) | |
tree | ddc1ac3a6fbb48f4efdde4be5d19e0d8f0ba8257 | |
parent | 9fbcecf2f5576c4742787a47adbfde500d765c62 (diff) |
Fix buildstack revision report
-rwxr-xr-x | tools/x-win/compile.sh | 1 | ||||
-rw-r--r-- | wscript | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/x-win/compile.sh b/tools/x-win/compile.sh index d778e921b5..643e3d84e6 100755 --- a/tools/x-win/compile.sh +++ b/tools/x-win/compile.sh @@ -75,6 +75,7 @@ fi CFLAGS="-mstackrealign$OPT" \ CXXFLAGS="-mstackrealign$OPT" \ LDFLAGS="-L${PREFIX}/lib" ./waf configure \ +DEPSTACK_ROOT="$PREFIX" \ --keepflags \ --dist-target=mingw \ --also-include=${PREFIX}/include \ @@ -307,7 +307,7 @@ def create_stored_revision(): def get_depstack_rev(depstack_root): try: with open(depstack_root + '/../.vers', 'r') as f: - return f.readline() + return f.readline().decode('utf-8').strip()[:7] except IOError: return '-unknown-'; @@ -874,7 +874,9 @@ def configure(conf): pkg_config_path = os.getenv('PKG_CONFIG_PATH') user_gtk_root = os.path.expanduser (Options.options.depstack_root + '/gtk/inst') - if pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0: + if os.getenv('DEPSTACK_ROOT') is not None and os.path.exists (os.getenv('DEPSTACK_ROOT') + '/lib'): + conf.env['DEPSTACK_REV'] = get_depstack_rev (os.getenv('DEPSTACK_ROOT') + '/lib') + elif pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0: # told to search user_gtk_root prefinclude = ''.join ([ '-I', user_gtk_root + '/include']) preflib = ''.join ([ '-L', user_gtk_root + '/lib']) |