Changeset 2867 in Sophya for trunk/SophyaLib/SysTools

Timestamp:

Jan 3, 2006, 3:18:57 PM (20 years ago)

Author:

ansari

Message:

Portage/compilation sur AIX-XlC (regatta) - Reza 3 Jan 2006

Location:

trunk/SophyaLib/SysTools

Files:

• commander.cc (modified) (1 diff)
• cxxcmplnk.cc (modified) (4 diffs)
• pdlmgr.cc (modified) (2 diffs)

trunk/SophyaLib/SysTools/commander.cc

@@ -1578 +1578 @@
   pev += '=';
   pev += vv;
-#if defined(Linux)
+#if defined(Linux) || defined(AIX)
 // Reza - 28/04/2004 
 // putenv de Linux ne declare pas la variable char *string const
 // On ne doit meme pas utiliser une variable automatique  
 // J'alloue donc un nouveau tableau - mais qui va le liberer ?
+// Idem AIX , Reza Dec 2005 
   char* bev = new char[pev.size()+1];
   strcpy(bev, pev.c_str());

trunk/SophyaLib/SysTools/cxxcmplnk.cc

@@ -44 +44 @@
 "-O -no_implicit_include -pthread";
 static char * SGICC_opt =  "-O -prelink -D__SGICC__ -LANG:std";
+static char * xlC_opt = 
+"-O -qrtti=all -qeh=v6";
 
 /* --Methode-- */
@@ -116 +118 @@
   syscomp += "icc/";  
 #endif
+#if defined( __IBMCPP__ )
+  compCmd = "xlC ";
+  compOptions = xlC_opt;
+  linkOptions = xlC_opt + string(" -brtl -qmkshrobj ");
+  syscomp += "xlC/";  
+#endif
 
 #ifndef Darwin
@@ -131 +139 @@
   char* varenv=NULL;
   varenv=getenv("SOPHYABASE");
+  string sbaserep = "./";
   if (varenv) {
     fgenv1 = true;
-    string sbaserep = varenv; 
+    sbaserep = varenv; 
     if (sbaserep[sbaserep.length()-1] != '/')  sbaserep += '/';
     cppFlags += ( " -I" + sbaserep + "include/ ");
@@ -159 +168 @@
   if (fglibsophya) linkOptions += " -lsophya ";
   if (fglibextsophya) linkOptions += " -lextsophya ";
+#if defined( AIX )
+  cout << " ++++==++ DBG/CxxCompilerLinker() - in AIX fglibpi= " 
+       << ((fglibpi) ? " true " : " false ")  << endl;
+  // Reza:Dec 2005 : pb avec les programmes PI sur AIX si linke avec shared lib PI
+  // (Portage sur regatta.calcul.u-psud.fr AIX 5.3 , libXm Xt X11 en .a uniquement) 
+  if (fglibpi) { 
+    linkOptions += " -L" + sbaserep + "lib/";
+    linkOptions += " -lPIext -lPIGcont -lPI -lXm -lXt -lX11 -lpthread ";
+  }
+#else
   if (fglibpi) linkOptions += " -lPI ";
+#endif
   linkOptions += " -lm ";
 

trunk/SophyaLib/SysTools/pdlmgr.cc

@@ -97 +97 @@
     if (path.length() > 0)  cmd += path + ':';
     cmd += varenv;
-    putenv(const_cast<char *>(cmd.c_str()));
+    //AIX: l'argument de putenv n'est pas const (Reza Dec 2005)
+    //On fait un new - mais qui fait le delete ?
+    char * pevc = new char [cmd.length()+1];
+    strcpy(pevc, cmd.c_str());
+    putenv(pevc);
     }
 
@@ -172 +176 @@
 #endif
 #elif defined(AIX)
-  cmd = "ld -G -bnogc -bexpall -bM:1L -o " + fnameso + " " + fnameobj;
+  //  cmd = "ld -G -bnogc -bexpall -bM:1L -o " + fnameso + " " + fnameobj;
+  cmd = "cc -brtl -qmkshrobj -o " + fnameso + " " + fnameobj + " -lm -lc";;
 #elif defined(HPUX)
   cmd = "ld -b -o " + fnameso + " " + fnameobj + " -lm -lc";