|
 |
566e09d |
From e2873912f21a7c1f73ded766ebea96ef2f9e5a29 Mon Sep 17 00:00:00 2001
|
|
|
566e09d |
From: Tom Hughes <tom@compton.nu>
|
|
|
566e09d |
Date: Sat, 11 Jul 2015 00:30:09 +0100
|
|
|
566e09d |
Subject: [PATCH 1/5] Don't try and edit compiler settings
|
|
|
4b6f602 |
|
|
|
566e09d |
---
|
|
|
566e09d |
setup.py | 20 --------------------
|
|
|
566e09d |
1 file changed, 20 deletions(-)
|
|
|
4b6f602 |
|
|
|
4b6f602 |
diff --git a/setup.py b/setup.py
|
|
|
566e09d |
index a19fbb36e..f2f34fad0 100755
|
|
|
4b6f602 |
--- a/setup.py
|
|
|
4b6f602 |
+++ b/setup.py
|
|
|
dd4a860 |
@@ -82,24 +82,6 @@ class WhichBoostCommand(Command):
|
|
|
4b6f602 |
print("\n".join(get_boost_library_names()))
|
|
|
4b6f602 |
|
|
|
4b6f602 |
|
|
|
4b6f602 |
-cflags = sysconfig.get_config_var('CFLAGS')
|
|
|
4b6f602 |
-sysconfig._config_vars['CFLAGS'] = re.sub(
|
|
|
d0f1c0a |
- ' +', ' ', cflags.replace('-g ', '').replace('-Os', '').replace('-arch i386', ''))
|
|
|
4b6f602 |
-opt = sysconfig.get_config_var('OPT')
|
|
|
4b6f602 |
-sysconfig._config_vars['OPT'] = re.sub(
|
|
|
d0f1c0a |
- ' +', ' ', opt.replace('-g ', '').replace('-Os', ''))
|
|
|
4b6f602 |
-ldshared = sysconfig.get_config_var('LDSHARED')
|
|
|
4b6f602 |
-sysconfig._config_vars['LDSHARED'] = re.sub(
|
|
|
d0f1c0a |
- ' +', ' ', ldshared.replace('-g ', '').replace('-Os', '').replace('-arch i386', ''))
|
|
|
4b6f602 |
-ldflags = sysconfig.get_config_var('LDFLAGS')
|
|
|
4b6f602 |
-sysconfig._config_vars['LDFLAGS'] = re.sub(
|
|
|
d0f1c0a |
- ' +', ' ', ldflags.replace('-g ', '').replace('-Os', '').replace('-arch i386', ''))
|
|
|
4b6f602 |
-pycflags = sysconfig.get_config_var('PY_CFLAGS')
|
|
|
4b6f602 |
-sysconfig._config_vars['PY_CFLAGS'] = re.sub(
|
|
|
d0f1c0a |
- ' +', ' ', pycflags.replace('-g ', '').replace('-Os', '').replace('-arch i386', ''))
|
|
|
4b6f602 |
-sysconfig._config_vars['CFLAGSFORSHARED'] = ''
|
|
|
4b6f602 |
-os.environ['ARCHFLAGS'] = ''
|
|
|
4b6f602 |
-
|
|
|
4b6f602 |
if os.environ.get("MASON_BUILD", "false") == "true":
|
|
|
4b6f602 |
# run bootstrap.sh to get mason builds
|
|
|
4b6f602 |
subprocess.call(['./bootstrap.sh'])
|
|
|
566e09d |
@@ -243,8 +225,6 @@ if sys.platform == 'darwin':
|
|
|
dd4a860 |
linkflags.append('-mmacosx-version-min=10.11')
|
|
|
4b6f602 |
else:
|
|
|
4b6f602 |
linkflags.append('-lrt')
|
|
|
4b6f602 |
- linkflags.append('-Wl,-z,origin')
|
|
|
dd4a860 |
- linkflags.append('-Wl,-rpath=$ORIGIN/lib')
|
|
|
4b6f602 |
|
|
|
4b6f602 |
if os.environ.get("CC", False) == False:
|
|
|
4b6f602 |
os.environ["CC"] = check_output([mapnik_config, '--cxx'])
|
|
|
566e09d |
--
|
|
|
566e09d |
2.21.0
|
|
|
566e09d |
|