Skip to content

Commit a2dfb88

Browse files
committed
Setup.py fixes for linux
1 parent 36e724c commit a2dfb88

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

setup.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@
4949
f_paths.write('\n')
5050

5151
if mason_build:
52-
lib_files = os.listdir(lib_path)
53-
lib_files = [os.path.join(lib_path, f) for f in lib_files if f.startswith('libmapnik.')]
54-
for f in lib_files:
55-
try:
56-
shutil.copyfile(f, os.path.join('mapnik', os.path.basename(f)))
57-
except shutil.Error:
58-
pass
52+
try:
53+
if sys.platform == 'darwin':
54+
base_f = 'libmapnik.dylib'
55+
else:
56+
base_f = 'libmapnik.so.3.0'
57+
f = os.path.join(lib_path, base_f)
58+
shutil.copyfile(f, os.path.join('mapnik', base_f))
59+
except shutil.Error:
60+
pass
5961
input_plugin_path = subprocess.check_output([mapnik_config, '--input-plugins']).rstrip('\n')
6062
input_plugin_files = os.listdir(input_plugin_path)
6163
input_plugin_files = [os.path.join(input_plugin_path, f) for f in input_plugin_files]
@@ -145,7 +147,7 @@
145147
linkflags.append('-mmacosx-version-min=10.8')
146148
else:
147149
linkflags.append('-Wl,-z,origin')
148-
linkflags.append('-Wl,-rpath=\$$ORIGIN')
150+
linkflags.append('-Wl,-rpath=$ORIGIN')
149151

150152
if os.environ.get("CC",False) == False:
151153
os.environ["CC"] = subprocess.check_output([mapnik_config, '--cxx']).rstrip('\n')

0 commit comments

Comments
 (0)