Commits

Satish Balay committed 43eafc0 Merge

Merge branch 'balay/gnupackage-fixes'

Comments (0)

Files changed (7)

config/BuildSystem/config/package.py

         args.append('--with-'+d.package+'='+d.directory)
     for d in self.odeps:
       if hasattr(d,'found') and d.found:
-        args.append('--with-'+d.package+'='+d.directory)
+        if d.directory:
+          args.append('--with-'+d.package+'='+d.directory)
+        else:
+          args.append('--with-'+d.package)
+      else:
+        args.append('--without-'+d.package)
     return args
 
   def formGNUConfigureArgs(self):
         args.append('--disable-f90')
       args.append('F77="'+fc+'"')
       args.append('FFLAGS="'+self.getCompilerFlags().replace('-Mfree','')+'"')
+      args.append('FC="'+fc+'"')
+      args.append('FCLAGS="'+self.getCompilerFlags().replace('-Mfree','')+'"')
       self.popLanguage()
     else:
+      args.append('--disable-fortran')
+      args.append('--disable-fc')
       args.append('--disable-f77')
       args.append('--disable-f90')
     if self.framework.argDB['with-shared-libraries'] or self.framework.argDB['download-'+self.package+'-shared']:
-      if self.compilers.isGCC or config.setCompilers.Configure.isIntel(compiler):
-        if config.setCompilers.Configure.isDarwin():
-          args.append('--enable-sharedlibs=gcc-osx')
-        else:
-          args.append('--enable-sharedlibs=gcc')
-      elif config.setCompilers.Configure.isSun(compiler):
-        args.append('--enable-sharedlibs=solaris-cc')
-      else:
-        args.append('--enable-sharedlibs=libtool')
+      args.append('--enable-shared')
     else:
-        args.append('--disable-shared')
+      args.append('--disable-shared')
     args.extend(self.formGNUConfigureDepArgs())
     args.extend(self.formGNUConfigureExtraArgs())
     return args

config/BuildSystem/config/packages/MOAB.py

     self.downloadfilename  = 'moab'
     self.downloadversion   = 'nightly'
     self.downloadext       = 'tar.gz'
-
-    self.functions         = ['iMesh_newMesh']
-    self.functionsFortran  = 1
-    self.includes          = ['iMesh.h']
-    self.liblist           = [['libiMesh.a', 'libMOAB.a']]
+    self.functions         = ['Core']
+    self.functionsCxx     = [1, 'namespace moab {class Core {public: Core();};}','moab::Core *mb = new moab::Core()']
+    self.includes          = ['moab/Core.hpp']
+    self.liblist           = [['libiMesh.a', 'libMOAB.a'],['libMOAB.a']]
     self.cxx               = 1
     return
 

config/BuildSystem/config/packages/hdf5.py

       args.append('F9X="'+self.setCompilers.getCompiler()+'"')
       args.append('F90="'+self.setCompilers.getCompiler()+'"')
       self.setCompilers.popLanguage()
+    if self.framework.argDB['with-shared-libraries']:
+      args.append('--enable-shared')
+    else:
+      args.append('--disable-shared')
 
     args = ' '.join(args)
     fd = file(os.path.join(self.packageDir,'hdf5'), 'w')

config/BuildSystem/config/packages/netcdf.py

     args = []
     args.append('AR="'+self.setCompilers.AR+'"')
     args.append('ARFLAGS="'+self.setCompilers.AR_FLAGS+'"')
-    args.append('CPPFLAGS="'+self.headers.toString(self.hdf5.include)+'"')
-    args.append('LIBS="'+self.libraries.toString(self.hdf5.lib)+'"')
     args.append('--libdir='+os.path.join(self.installDir,self.libdir))
+    if hasattr(self.hdf5,'found') and self.hdf5.found:
+      args.append('CPPFLAGS="'+self.headers.toString(self.hdf5.include)+'"')
+      args.append('LIBS="'+self.libraries.toString(self.hdf5.lib)+'"')
+      args.append('--enable-netcdf-4')
+    else:
+      args.append('--disable-netcdf-4')
     args.append('--disable-dap')
     args.append('--disable-hdf4')
-    args.append('--enable-netcdf-4')
     return args

config/examples/arch-freebsd-cxx-pkgs-opt.py

   '--download-umfpack=1',
   '--download-chaco=1',
   '--download-spai=1',
+  '--download-netcdf=1',
+  '--download-moab=1',
   ]
 
 if __name__ == '__main__':

config/examples/arch-linux-pkgs-cxx-mlib.py

   '--download-mumps=1',
   '--download-elemental=1',
   '--download-spai=1',
-  '--download-chaco=1'
+  '--download-chaco=1',
+  '--download-netcdf=1',
+  '--download-hdf5=1',
+  '--download-moab=1',
   ]
 
 if __name__ == '__main__':

config/examples/arch-osx-10.6-cxx-pkgs-opt.py

   '--download-umfpack=1',
   '--download-chaco=1',
   '--download-spai=1',
+  '--download-moab=1',
   ]
 
 if __name__ == '__main__':
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.