Commit e71bc2c4 authored by marcochapeau's avatar marcochapeau
Browse files

* Fix the SONAME issue. lconfig now builds the correct symlinks to the libraries

git-svn-id: 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 900b5757
......@@ -25,9 +25,6 @@ from string import Template
# Define the library suffix for POSIX like systems
if env['PLATFORM'] == 'posix':
env.AppendUnique(SHLIBSUFFIX='.' + env['JACK_VERSION'])
# Paths where include files can be found
env.AppendUnique(CPPPATH=['#/', '#/common', '#/common/jack'])
......@@ -147,11 +144,17 @@ jack_headers = [
# Libraries
clientlib = env.SharedLibrary(env['CLIENTLIB'], srcfiles_common_clientlib)
serverlib = env.SharedLibrary(env['SERVERLIB'], srcfiles_common_serverlib)
# Each platform should get it's own environment
libenv = env.Copy()
if env['PLATFORM'] == 'posix':
libenv.Append(SHLIBSUFFIX='.' + env['JACK_VERSION'])
libenv.Append(SHLINKFLAGS='-Wl,-soname,${str(TARGET.file).split(".")[0]}.so.' + str(env['JACK_MAJOR_VERSION']))
clientlib = libenv.SharedLibrary(env['CLIENTLIB'], srcfiles_common_clientlib)
serverlib = libenv.SharedLibrary(env['SERVERLIB'], srcfiles_common_serverlib)
env.Install( env['LIBDIR'], [clientlib, serverlib])
if not env['FULL_MIMIC']:
wrapperlib = env.SharedLibrary(env['WRAPPERLIB'], srcfiles_common_wrapperlib, LIBS='dl')
wrapperlib = libenv.SharedLibrary(env['WRAPPERLIB'], srcfiles_common_wrapperlib, LIBS='dl')
env.Install( env['LIBDIR'], [wrapperlib])
env.Alias('install', env['LIBDIR'])
......@@ -161,9 +164,6 @@ if env['PLATFORM'] == 'posix':
libs = [(env['CLIENTLIB'], clientlib), (env['SERVERLIB'], serverlib)]
if not env['FULL_MIMIC']:
libs.append((env['WRAPPERLIB'], wrapperlib))
# When we use the wrapper, we want symlinks named[.0] so regular clients can use it as a proxy
# this will delete the 2 links installed by jack-1
# if jackd if running and not jackdmp, jack-1 libs will be used (hopefully...)
for lib_name, lib in libs:
env.Command('#/common/lib' + lib_name + '.so.' + str(env['JACK_MAJOR_VERSION']), lib, symlinkcmd)
env.Command('#/common/lib' + lib_name + '.so', '#/common/lib' + lib_name + '.so.' + str(env['JACK_MAJOR_VERSION']), symlinkcmd)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment