products/patches/petsc-3.15-cmakeUnusedOptions.patch

   1 diff -Naur petsc_ref/config/BuildSystem/config/package.py petsc_new/config/BuildSystem/config/package.py
   2 --- petsc_ref/config/BuildSystem/config/package.py      2021-03-31 02:22:39.000000000 +0200
   3 +++ petsc_new/config/BuildSystem/config/package.py      2021-06-01 16:57:13.432206497 +0200
   4 @@ -1704,7 +1704,7 @@
   5
   6      args = ['-DCMAKE_INSTALL_PREFIX='+self.installDir]
   7      args.append('-DCMAKE_INSTALL_NAME_DIR:STRING="'+os.path.join(self.installDir,self.libdir)+'"')
   8 -    args.append('-DCMAKE_INSTALL_LIBDIR:STRING="lib"')
   9 +    #args.append('-DCMAKE_INSTALL_LIBDIR:STRING="lib"')
  10      args.append('-DCMAKE_VERBOSE_MAKEFILE=1')
  11      if self.compilerFlags.debugging:
  12        args.append('-DCMAKE_BUILD_TYPE=Debug')
  13 @@ -1712,32 +1712,33 @@
  14        args.append('-DCMAKE_BUILD_TYPE=Release')
  15      self.framework.pushLanguage('C')
  16      args.append('-DCMAKE_C_COMPILER="'+self.framework.getCompiler()+'"')
  17 -    args.append('-DMPI_C_COMPILER="'+self.framework.getCompiler()+'"')
  18 +    #args.append('-DMPI_C_COMPILER="'+self.framework.getCompiler()+'"')
  19      args.append('-DCMAKE_AR='+self.setCompilers.AR)
  20      ranlib = shlex.split(self.setCompilers.RANLIB)[0]
  21      args.append('-DCMAKE_RANLIB='+ranlib)
  22      cflags = self.updatePackageCFlags(self.setCompilers.getCompilerFlags())
  23      args.append('-DCMAKE_C_FLAGS:STRING="'+cflags+'"')
  24 -    args.append('-DCMAKE_C_FLAGS_DEBUG:STRING="'+cflags+'"')
  25 +    #args.append('-DCMAKE_C_FLAGS_DEBUG:STRING="'+cflags+'"')
  26      args.append('-DCMAKE_C_FLAGS_RELEASE:STRING="'+cflags+'"')
  27      self.framework.popLanguage()
  28 -    if hasattr(self.compilers, 'CXX'):
  29 -      self.framework.pushLanguage('Cxx')
  30 -      args.append('-DCMAKE_CXX_COMPILER="'+self.framework.getCompiler()+'"')
  31 -      args.append('-DMPI_CXX_COMPILER="'+self.framework.getCompiler()+'"')
  32 -      args.append('-DCMAKE_CXX_FLAGS:STRING="'+self.updatePackageCxxFlags(self.framework.getCompilerFlags())+'"')
  33 -      args.append('-DCMAKE_CXX_FLAGS_DEBUG:STRING="'+self.updatePackageCxxFlags(self.framework.getCompilerFlags())+'"')
  34 -      args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING="'+self.updatePackageCxxFlags(self.framework.getCompilerFlags())+'"')
  35 -      self.framework.popLanguage()
  36 +
  37 +     #if hasattr(self.compilers, 'CXX'):
  38 +      #self.framework.pushLanguage('Cxx')
  39 +      #args.append('-DCMAKE_CXX_COMPILER="'+self.framework.getCompiler()+'"')
  40 +      #args.append('-DMPI_CXX_COMPILER="'+self.framework.getCompiler()+'"')
  41 +      #args.append('-DCMAKE_CXX_FLAGS:STRING="'+self.updatePackageCxxFlags(self.framework.getCompilerFlags())+'"')
  42 +      #args.append('-DCMAKE_CXX_FLAGS_DEBUG:STRING="'+self.updatePackageCxxFlags(self.framework.getCompilerFlags())+'"')
  43 +      #args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING="'+self.updatePackageCxxFlags(self.framework.getCompilerFlags())+'"')
  44 +      #self.framework.popLanguage()
  45
  46 -    if hasattr(self.compilers, 'FC'):
  47 -      self.framework.pushLanguage('FC')
  48 -      args.append('-DCMAKE_Fortran_COMPILER="'+self.framework.getCompiler()+'"')
  49 -      args.append('-DMPI_Fortran_COMPILER="'+self.framework.getCompiler()+'"')
  50 -      args.append('-DCMAKE_Fortran_FLAGS:STRING="'+self.updatePackageFFlags(self.framework.getCompilerFlags())+'"')
  51 -      args.append('-DCMAKE_Fortran_FLAGS_DEBUG:STRING="'+self.updatePackageFFlags(self.framework.getCompilerFlags())+'"')
  52 -      args.append('-DCMAKE_Fortran_FLAGS_RELEASE:STRING="'+self.updatePackageFFlags(self.framework.getCompilerFlags())+'"')
  53 -      self.framework.popLanguage()
  54 +    #if hasattr(self.compilers, 'FC'):
  55 +      #self.framework.pushLanguage('FC')
  56 +      #args.append('-DCMAKE_Fortran_COMPILER="'+self.framework.getCompiler()+'"')
  57 +      #args.append('-DMPI_Fortran_COMPILER="'+self.framework.getCompiler()+'"')
  58 +      #args.append('-DCMAKE_Fortran_FLAGS:STRING="'+self.updatePackageFFlags(self.framework.getCompilerFlags())+'"')
  59 +      #args.append('-DCMAKE_Fortran_FLAGS_DEBUG:STRING="'+self.updatePackageFFlags(self.framework.getCompilerFlags())+'"')
  60 +      #args.append('-DCMAKE_Fortran_FLAGS_RELEASE:STRING="'+self.updatePackageFFlags(self.framework.getCompilerFlags())+'"')
  61 +      #self.framework.popLanguage()
  62
  63      if self.setCompilers.LDFLAGS:
  64        args.append('-DCMAKE_EXE_LINKER_FLAGS:STRING="'+self.setCompilers.LDFLAGS+'"')