makebindist.py fixes for Solaris

2 files changed, 26 insertions, 27 deletions

diff --git a/distribution/bin/makebindist.py b/distribution/bin/makebindist.py
index c891e26fdd1..9f650beca01 100755
--- a/distribution/bin/makebindist.py
+++ b/distribution/bin/makebindist.py
@@ -155,7 +155,7 @@ if forceclean or not os.path.exists(srcDir) or not os.path.exists(buildDir):
         sys.exit(1)
     os.rename("Ice-" + version, srcDir)
     
-    if build_lp64.has_key(str(platform)):
+    if "cpp-64" in buildLanguages:
         if os.system("gunzip -c " + os.path.join(cwd, "Ice-" + version + ".tar.gz") + " | tar x" + quiet + "f -"):
             print sys.argv[0] + ": failed to unpack ./Ice-" + version + ".tar.gz"
             sys.exit(1)
@@ -174,29 +174,19 @@ for l in buildLanguages:
     print "============= Building " + l + " sources ============="
     print
 
-    os.chdir(os.path.join(srcDir, l))
+    if l != "cpp-64":
+        os.chdir(os.path.join(srcDir, l))
+    else:
+        os.chdir(os.path.join(srcDir + "-64", "cpp"))
 
     if l != "java":
 
         makeCmd = "gmake " + platform.getMakeEnvs(version, l) + " prefix=" + buildDir + " install"
 
-        if not l in build_lp64.get(str(platform), []):
-            if os.system(makeCmd) != 0:
-                print sys.argv[0] + ": `" + l + "' build failed"
-                os.chdir(cwd)
-                sys.exit(1)
-        else:
-            if os.system("LP64=no " + makeCmd) != 0:
-                print sys.argv[0] + ": `" + l + "' build failed"
-                os.chdir(cwd)
-                sys.exit(1)
-
-            os.chdir(os.path.join(srcDir + "-64", l))
-            if os.system("LP64=yes " + makeCmd) != 0:
-                print sys.argv[0] + ": `" + l + "' build failed"
-                os.chdir(cwd)
-                sys.exit(1)
-
+        if os.system(makeCmd) != 0:
+            print sys.argv[0] + ": `" + l + "' build failed"
+            os.chdir(cwd)
+            sys.exit(1)
     else:
         antCmd = platform.getAntEnv() + " ant " + platform.getAntOptions() + " -Dprefix=" + buildDir
 
diff --git a/distribution/lib/DistUtils.py b/distribution/lib/DistUtils.py
index 90c40cf44d5..876f146a15c 100644
--- a/distribution/lib/DistUtils.py
+++ b/distribution/lib/DistUtils.py
@@ -15,7 +15,7 @@ from stat import *
 # Defines which languges are supported on each supported platform
 #
 languages = { \
-    'SunOS' : ['cpp', 'java'], \
+    'SunOS' : ['cpp', 'cpp-64', 'java'], \
     'Darwin' : ['cpp', 'java', 'py'], \
     'Linux' : ['cpp', 'java', 'cs', 'py', 'rb', 'php'], \
 }
@@ -719,11 +719,17 @@ class Platform:
             envs.append("OPTIMIZE=yes")
 
         # Language specific environment variables to pass to make.
-        if language == "cpp":
+        if language == "cpp" or language == "cpp-64":
             envs.append("create_runpath_symlink=no")
         elif language == "cs":
             envs.append("NOGAC=1")
 
+        # LP64
+        if language == "cpp-64":
+            envs.append("LP64=yes")
+        else:
+            envs.append("LP64=no")
+            
         return string.join(envs, " ")
 
     def getAntEnv(self):
@@ -860,7 +866,7 @@ class SunOS(Platform):
 class BerkeleyDB(ThirdParty):
     def __init__(self, platform):
         global berkeleydb, berkeleydbjar
-        ThirdParty.__init__(self, platform, "BerkeleyDB", berkeleydb, ["cpp", "java"], None, "DB_HOME")
+        ThirdParty.__init__(self, platform, "BerkeleyDB", berkeleydb, ["cpp", "cpp-64", "java"], None, "DB_HOME")
         if not self.location: # BerkeleyDB is installed with the system (Linux)
             self.languages = ["java"]
             self.location = berkeleydbjar.get(str(platform), None)
@@ -891,7 +897,7 @@ class Bzip2(ThirdParty):
 class Expat(ThirdParty):
     def __init__(self, platform):
         global expat
-        ThirdParty.__init__(self, platform, "Expat", expat, ["cpp"])
+        ThirdParty.__init__(self, platform, "Expat", expat, ["cpp", "cpp-64"])
 
     def getFilesFromSubDirs(self, platform, bindir, libdir, x64):
         return platform.getSharedLibraryFiles(self.location, os.path.join(libdir, "libexpat*"))
@@ -899,7 +905,7 @@ class Expat(ThirdParty):
 class OpenSSL(ThirdParty):
     def __init__(self, platform):
         global openssl
-        ThirdParty.__init__(self, platform, "OpenSSL", openssl, ["cpp"])
+        ThirdParty.__init__(self, platform, "OpenSSL", openssl, ["cpp", "cpp-64"])
 
     def getFilesFromSubDirs(self, platform, bindir, libdir, x64):
         files = [ os.path.join(bindir, "openssl") ]
@@ -910,13 +916,16 @@ class OpenSSL(ThirdParty):
 class Mcpp(ThirdParty):
     def __init__(self, platform):
         global mcpp
-        ThirdParty.__init__(self, platform, "Mcpp", mcpp, ["cpp"])
+        ThirdParty.__init__(self, platform, "Mcpp", mcpp, ["cpp", "cpp-64"])
 
 class Qt(ThirdParty):
     def __init__(self, platform):
         global qt
-        ThirdParty.__init__(self, platform, "Qt", qt, ["cpp"])
-
+        if platform.pkgArch == "sparc":
+            ThirdParty.__init__(self, platform, "Qt", qt, ["cpp"])
+        else:
+            ThirdParty.__init__(self, platform, "Qt", qt, ["cpp", "cpp-64"])
+            
     def getFilesFromSubDirs(self, platform, bindir, libdir, x64):
 	files = platform.getSharedLibraryFiles(self.location, os.path.join(libdir, "libQtCore*"))
 	files += platform.getSharedLibraryFiles(self.location, os.path.join(libdir, "libQtSql*"))