diff options
| author | Alexandre Feblot <devnull@localhost> | 2014-09-21 19:19:42 (GMT) |
|---|---|---|
| committer | Alexandre Feblot <devnull@localhost> | 2014-09-21 19:19:42 (GMT) |
| commit | c60c51f29fa2044ec13b8a3160e2f26bb3531497 (patch) | |
| tree | 4a24a46556e3568d1844873533b6a0c5c901792d /src | |
| parent | 3460931829a56a63ee077d126e051032cf5aedef (diff) | |
| download | SCons-c60c51f29fa2044ec13b8a3160e2f26bb3531497.zip SCons-c60c51f29fa2044ec13b8a3160e2f26bb3531497.tar.gz SCons-c60c51f29fa2044ec13b8a3160e2f26bb3531497.tar.bz2 | |
Attempt to fix versionned shared library on Solaris
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/install.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/link.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 55eb1d3..81c052f 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -256,7 +256,7 @@ def VersionShLibLinkNames(version, libname, env): if Verbose: print "VersionShLibLinkNames: linkname = ",linkname linknames.append(linkname) - elif platform == 'posix': + elif platform == 'posix' or platform == 'sunos': if sys.platform.startswith('openbsd'): # OpenBSD uses x.y shared library versioning numbering convention # and doesn't use symlinks to backwards-compatible libraries diff --git a/src/engine/SCons/Tool/install.py b/src/engine/SCons/Tool/install.py index 0c81d05..66869b7 100644 --- a/src/engine/SCons/Tool/install.py +++ b/src/engine/SCons/Tool/install.py @@ -149,7 +149,7 @@ def versionedLibVersion(dest, env): """Check if dest is a version shared library name. Return version, libname, & install_dir if it is.""" Verbose = False platform = env.subst('$PLATFORM') - if not (platform == 'posix' or platform == 'darwin'): + if not (platform == 'posix' or platform == 'darwin' or platform == 'sunos'): return (None, None, None) libname = os.path.basename(dest) @@ -160,7 +160,7 @@ def versionedLibVersion(dest, env): version_re = re.compile("[0-9]+\\.[0-9]+\\.[0-9a-zA-Z]+") version_File = None - if platform == 'posix': + if platform == 'posix' or platform == 'sunos': # handle unix names versioned_re = re.compile(re.escape(shlib_suffix + '.') + "[0-9]+\\.[0-9]+\\.[0-9a-zA-Z]+") result = versioned_re.findall(libname) diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py index baa7407..f70f5b8 100644 --- a/src/engine/SCons/Tool/link.py +++ b/src/engine/SCons/Tool/link.py @@ -105,7 +105,7 @@ def shlib_emitter_names(target, source, env): # We need a version of the form x.y.z to proceed raise ValueError if version: - if platform == 'posix': + if platform == 'posix' or platform == 'sunos': versionparts = version.split('.') name = target[0].name # generate library name with the version number |