From 53f52a07cbf580c23989bf762080699d16aadf1f Mon Sep 17 00:00:00 2001 From: Hyungoo Kang Date: Sat, 5 Jan 2013 03:59:31 +0900 Subject: [PATCH 1/3] Fix dahlia/libsass-python#4 --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b3740f8b..30cb4a3b 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ version = '0.2.4' -libsass_sources = [ +libsass_sources = [ 'constants.cpp', 'context.cpp', 'functions.cpp', 'document.cpp', 'document_parser.cpp', 'eval_apply.cpp', 'node.cpp', 'node_factory.cpp', 'node_emitters.cpp', 'prelexer.cpp', @@ -55,7 +55,9 @@ def spawn(self, cmd): link_flags = [] macros = {'LIBSASS_PYTHON_VERSION': '\\"' + version + '\\"'} else: - flags = ['-fPIC', '-Wall', '-Wno-parentheses', '-Wno-tautological-compare'] + flags = ['-fPIC', '-Wall', '-Wno-parentheses'] + if sys.platform != 'darwin': + flags.append('-Wno-tautological-compare') link_flags = ['-fPIC', '-lstdc++'] macros = {'LIBSASS_PYTHON_VERSION': '"' + version + '"'} From 0b30611afe5bcd334bb2f609fc57782096c082e1 Mon Sep 17 00:00:00 2001 From: Hyungoo Kang Date: Sat, 5 Jan 2013 04:05:02 +0900 Subject: [PATCH 2/3] Fix dahlia/libsass-python#4 --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 30cb4a3b..a936175f 100644 --- a/setup.py +++ b/setup.py @@ -55,9 +55,9 @@ def spawn(self, cmd): link_flags = [] macros = {'LIBSASS_PYTHON_VERSION': '\\"' + version + '\\"'} else: - flags = ['-fPIC', '-Wall', '-Wno-parentheses'] - if sys.platform != 'darwin': - flags.append('-Wno-tautological-compare') + flags = ['-fPIC', '-Wall', '-Wno-parentheses', '-Wno-tautological-compare'] + if sys.platform == 'darwin': + flags.pop() link_flags = ['-fPIC', '-lstdc++'] macros = {'LIBSASS_PYTHON_VERSION': '"' + version + '"'} From 75e161dca266e547ba0e7c91870a1b4f277eb33c Mon Sep 17 00:00:00 2001 From: Hyungoo Kang Date: Sat, 5 Jan 2013 08:57:31 +0900 Subject: [PATCH 3/3] Fix dahlia/libsass-python#4 by dropping flag --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index a936175f..7ac20ffe 100644 --- a/setup.py +++ b/setup.py @@ -55,9 +55,7 @@ def spawn(self, cmd): link_flags = [] macros = {'LIBSASS_PYTHON_VERSION': '\\"' + version + '\\"'} else: - flags = ['-fPIC', '-Wall', '-Wno-parentheses', '-Wno-tautological-compare'] - if sys.platform == 'darwin': - flags.pop() + flags = ['-fPIC', '-Wall', '-Wno-parentheses'] link_flags = ['-fPIC', '-lstdc++'] macros = {'LIBSASS_PYTHON_VERSION': '"' + version + '"'}