| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465 |
- $OpenBSD: patch-src_build_py,v 1.5 2016/09/04 16:46:57 landry Exp $
- --- src/build.py.orig Fri Feb 26 03:02:05 2016
- +++ src/build.py Sun Sep 4 17:29:08 2016
- @@ -37,9 +37,6 @@ def call(cmd, silent=True):
- elif not silent:
- print stderr
-
- -def ldconfig(*args,**kwargs):
- - call('ldconfig')
- -
- if env['LINKING'] == 'static':
- lib_env.Append(CXXFLAGS="-fPIC")
-
- @@ -136,7 +133,7 @@ else: # unix, non-macos
- else:
- mapnik_lib_link_flag += ' -Wl,-h,%s' % mapnik_libname
- else: # Linux and others
- - if env['PLATFORM'] != 'FreeBSD':
- + if env['PLATFORM'] != 'OpenBSD':
- lib_env['LIBS'].append('dl')
- mapnik_lib_link_flag += ' -Wl,-rpath-link,.'
- if env['ENABLE_SONAME']:
- @@ -434,9 +431,7 @@ else:
- os.remove(trgt)
- os.symlink(os.path.basename(src), trgt)
-
- - major, minor, micro = ABI_VERSION
- -
- - soFile = "%s.%d.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor), int(micro))
- + soFile = "%s.${LIBmapnik_VERSION}" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])))
- target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)
-
- if 'uninstall' not in COMMAND_LINE_TARGETS:
- @@ -446,30 +441,8 @@ else:
- mapnik = lib_env_final.SharedLibrary(env['MAPNIK_NAME'], source)
- result = env.InstallAs(target=target, source=mapnik)
- env.Alias(target='install', source=result)
- - if result:
- - env.AddPostAction(result, ldconfig)
-
- - # Install symlinks
- - target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % \
- - (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])),int(major), int(minor)))
- - target2 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])))
- - if 'uninstall' not in COMMAND_LINE_TARGETS:
- - link1 = env.Command(target1, target, symlink)
- - env.Alias(target='install', source=link1)
- - link2 = env.Command(target2, target1, symlink)
- - env.Alias(target='install', source=link2)
- - # delete in reverse order..
- - env['create_uninstall_target'](env, target2)
- - env['create_uninstall_target'](env, target1)
- env['create_uninstall_target'](env, target)
- -
- - # to enable local testing
- - lib_major_minor = "%s.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor))
- - local_lib = os.path.basename(env.subst(env['MAPNIK_LIB_NAME']))
- - if os.path.islink(lib_major_minor) or os.path.exists(lib_major_minor):
- - os.remove(lib_major_minor)
- - os.symlink(local_lib,lib_major_minor)
- - Clean(mapnik,lib_major_minor);
-
- if not env['RUNTIME_LINK'] == 'static':
- Depends(mapnik, env.subst('../deps/agg/libagg.a'))
|
