From cdb339213b2c01e13770ced268fcafdd5a5dc606 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Thu, 5 Jan 2012 21:01:11 +0100 Subject: [PATCH] Issue 1098 --- ChangeLog | 4 ++++ waflib/Tools/python.py | 2 +- waflib/Tools/qt4.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d41388e5..3ce5a190 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +NEW IN WAF 1.6.11 +----------------- +* Apply the chmod attribute to the versioned libraries (vnum) + NEW IN WAF 1.6.10 ----------------- * Fixed the 'remove' attribute propagation in ant_glob #1086 diff --git a/waflib/Tools/python.py b/waflib/Tools/python.py index 93b0ddb6..9533f5eb 100644 --- a/waflib/Tools/python.py +++ b/waflib/Tools/python.py @@ -156,7 +156,7 @@ def init_pyext(self): @feature('pyext') @before_method('apply_link', 'apply_bundle') def set_bundle(self): - if Utils.unversioned_sys_platform == 'darwin': + if Utils.unversioned_sys_platform() == 'darwin': self.mac_bundle = True @before_method('propagate_uselib_vars') diff --git a/waflib/Tools/qt4.py b/waflib/Tools/qt4.py index db802a4f..c1496622 100644 --- a/waflib/Tools/qt4.py +++ b/waflib/Tools/qt4.py @@ -522,7 +522,7 @@ def find_qt4_libraries(self): except self.errors.ConfigurationError: for i in self.qt4_vars: uselib = i.upper() - if Utils.unversioned_sys_platform == "darwin": + if Utils.unversioned_sys_platform() == "darwin": # Since at least qt 4.7.3 each library locates in separate directory frameworkName = i + ".framework" qtDynamicLib = os.path.join(qtlibs, frameworkName, i)