diff options
| author | Bernard Normier <bernard@zeroc.com> | 2013-03-04 11:46:27 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2013-03-04 11:46:27 -0500 |
| commit | 847e320da8024c723aa8633c095404bb8f338f64 (patch) | |
| tree | 63b831495eb41e30895cfec861b00ce179d404cc /distribution/lib/DistUtils.py | |
| parent | makedist.py fixes (diff) | |
| download | ice-847e320da8024c723aa8633c095404bb8f338f64.tar.bz2 ice-847e320da8024c723aa8633c095404bb8f338f64.tar.xz ice-847e320da8024c723aa8633c095404bb8f338f64.zip | |
Fixed ICE-5251: problem with 64-bit third-party install on Solaris
Diffstat (limited to 'distribution/lib/DistUtils.py')
| -rw-r--r-- | distribution/lib/DistUtils.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/distribution/lib/DistUtils.py b/distribution/lib/DistUtils.py index 9eab7160620..4eaa6d10dce 100644 --- a/distribution/lib/DistUtils.py +++ b/distribution/lib/DistUtils.py @@ -601,10 +601,10 @@ class ThirdParty : def getFiles(self, platform): files = self.getFilesFromSubDirs(platform, "bin", "lib", False) files += self.getFilesFromSubDirs(platform, "bin/c++11", "lib/c++11", False) - if platform.lp64subdir: + if platform.lp64Libdir: files += self.getFilesFromSubDirs(platform, \ - os.path.join("bin", platform.lp64subdir), \ - os.path.join("lib", platform.lp64subdir), True) + os.path.join("bin", platform.lp64Bindir), \ + os.path.join("lib", platform.lp64Libdir), True) return files def includeInDistribution(self): @@ -631,12 +631,13 @@ class ThirdParty : # Platform helper classes # class Platform: - def __init__(self, uname, pkgPlatform, pkgArch, languages, lp64subdir, shlibExtension): + def __init__(self, uname, pkgPlatform, pkgArch, languages, lp64Libdir, lp64Bindir, shlibExtension): self.uname = uname self.pkgPlatform = pkgPlatform self.pkgArch = pkgArch self.languages = languages - self.lp64subdir = lp64subdir + self.lp64Libdir = lp64Libdir + self.lp64Bindir = lp64Bindir self.shlibExtension = shlibExtension self.thirdParties = [] @@ -754,7 +755,7 @@ class Platform: class Darwin(Platform): def __init__(self, uname, arch, languages): - Platform.__init__(self, uname, "osx", None, languages, "", "dylib") + Platform.__init__(self, uname, "osx", None, languages, "", "", "dylib") def getSharedLibraryFiles(self, root, path, extension = None) : libraries = Platform.getSharedLibraryFiles(self, root, path, extension) @@ -873,14 +874,14 @@ class Darwin(Platform): class Linux(Platform): def __init__(self, uname, arch, languages): - Platform.__init__(self, uname, "linux", arch, languages, "", "so") + Platform.__init__(self, uname, "linux", arch, languages, "", "", "so") class SunOS(Platform): def __init__(self, uname, arch, languages): if arch == "i86pc": - Platform.__init__(self, uname, "solaris", "x86", languages, "amd64", "so") + Platform.__init__(self, uname, "solaris", "x86", languages, "64", "amd64", "so") else: - Platform.__init__(self, uname, "solaris", "sparc", languages, "sparcv9", "so") + Platform.__init__(self, uname, "solaris", "sparc", languages, "64", "sparcv9", "so") def getMakeOptions(self): return "-j 40" |