Permalink
Browse files

lib SOVERSIONs back from 1.0.0 to 1, following debian-multimedia advice

  • Loading branch information...
1 parent 617a6f1 commit c68729b59db0d820ee08ffc98ab9f633a12a07cb @danstowell danstowell committed Apr 10, 2011
Showing with 11 additions and 11 deletions.
  1. +11 −11 common/SConstruct
View
@@ -817,14 +817,14 @@ libscsynthEnv = serverEnv.Clone(
PKGCONFIG_LIBS = ['-lscsynth'],
# PKGCONFIG_LIBS_PRIVATE = ['-lm', '-lpthread', '-ldl'],
PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/server'],
- SHLIBSUFFIX='.so.1.0.0',
- LIBSUFFIXES=['.so.1.0.0']
+ SHLIBSUFFIX='.so.1',
+ LIBSUFFIXES=['.so.1']
)
if PLATFORM == 'linux':
libscsynthEnv.Append(
- LINKFLAGS = ['-Wl,-soname,libscsynth.so.1.0.0'])
+ LINKFLAGS = ['-Wl,-soname,libscsynth.so.1'])
# create local symlink for linker to follow (not installed)
- libscsynthEnv.Command('build/libscsynth.so', 'build/libscsynth.so.1.0.0', make_local_symlink, chdir=1)
+ libscsynthEnv.Command('build/libscsynth.so', 'build/libscsynth.so.1', make_local_symlink, chdir=1)
libscsynthSources = Split('''
Source/server/Rendezvous.cpp
@@ -855,7 +855,7 @@ scsynthSources = ['Source/server/scsynth_main.cpp']
libscsynth = libscsynthEnv.SharedLibrary('build/scsynth', libscsynthSources)
env.Alias('install-programs', env.Install(lib_dir(INSTALL_PREFIX), [libscsynth]))
-env.Alias('install-programs', env.Command(lib_dir(INSTALL_PREFIX) + '/libscsynth.so', lib_dir(INSTALL_PREFIX) + '/libscsynth.so.1.0.0', make_local_symlink, chdir=1))
+env.Alias('install-programs', env.Command(lib_dir(INSTALL_PREFIX) + '/libscsynth.so', lib_dir(INSTALL_PREFIX) + '/libscsynth.so.1', make_local_symlink, chdir=1))
libscsynthStaticSources = libscsynthSources + make_static_objects(serverEnv, commonSources, "_libscsynthStatic");
libscsynthStatic = serverEnv.StaticLibrary('build/scsynth', libscsynthStaticSources)
@@ -1064,15 +1064,15 @@ libsclangEnv = langEnv.Clone(
PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['sndfile']) + ['libscsynth'],
PKGCONFIG_LIBS = ['-lsclang'],
PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/lang', '-I${includedir}/server'],
- SHLIBSUFFIX='.so.1.0.0',
- LIBSUFFIXES=['.so.1.0.0']
+ SHLIBSUFFIX='.so.1',
+ LIBSUFFIXES=['.so.1']
)
if PLATFORM == 'linux':
libsclangEnv.Append(
- LINKFLAGS = ['-Wl,-soname,libsclang.so.1.0.0'])
+ LINKFLAGS = ['-Wl,-soname,libsclang.so.1'])
# create local symlink for linker to follow (not installed)
- libsclangEnv.Command('build/libsclang.so', 'build/libsclang.so.1.0.0', make_local_symlink, chdir=1)
- Requires('build/libsclang.so.1.0.0', 'build/libscsynth.so')
+ libsclangEnv.Command('build/libsclang.so', 'build/libsclang.so.1', make_local_symlink, chdir=1)
+ Requires('build/libsclang.so.1', 'build/libscsynth.so')
# required libraries
merge_lib_info(libsclangEnv, libraries['sndfile'])
@@ -1177,7 +1177,7 @@ sclangSources = ['Source/lang/LangSource/cmdLineFuncs.cpp']
if env['LANG']:
libsclang = libsclangEnv.SharedLibrary('build/sclang', libsclangSources)
env.Alias('install-bin', env.Install(lib_dir(INSTALL_PREFIX), [libsclang]))
- env.Alias('install-bin', env.Command(lib_dir(INSTALL_PREFIX) + '/libsclang.so', lib_dir(INSTALL_PREFIX) + '/libsclang.so.1.0.0', make_local_symlink, chdir=1))
+ env.Alias('install-bin', env.Command(lib_dir(INSTALL_PREFIX) + '/libsclang.so', lib_dir(INSTALL_PREFIX) + '/libsclang.so.1', make_local_symlink, chdir=1))
if PLATFORM == 'darwin':
sclangLibs = ['scsynth', 'sclang']
else:

0 comments on commit c68729b

Please sign in to comment.