[petsc] 04/05: refresh debian patches

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to tag experimental/3.7.6+dfsg1-1exp1
in repository petsc.

commit e2fa0afc9f7df0b1a9b37b5195f2bcbf1bddb629
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue May 30 13:13:30 2017 +0800

    refresh debian patches
---
 debian/patches/soname_extension | 48 +++++++++++------------------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/debian/patches/soname_extension b/debian/patches/soname_extension
index b383ba8..06f965e 100644
--- a/debian/patches/soname_extension
+++ b/debian/patches/soname_extension
@@ -122,34 +122,25 @@ Index: petsc/config/PETSc/Configure.py
      if not os.path.exists(os.path.join(self.petscdir.dir,self.arch.arch,'lib','pkgconfig')):
        os.makedirs(os.path.join(self.petscdir.dir,self.arch.arch,'lib','pkgconfig'))
      fd = open(os.path.join(self.petscdir.dir,self.arch.arch,'lib','pkgconfig','PETSc.pc'),'w')
-@@ -182,7 +191,7 @@ class Configure(config.base.Configure):
- 
-     fd.write('Cflags: '+self.allincludes+'\n')
- 
--    plibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),' -lpetsc'])
-+    plibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),' -lpetsc'+self.petsclibExt])
-     if self.framework.argDB['prefix']:
-       fd.write('Libs: '+plibs.replace(os.path.join(self.petscdir.dir,self.arch.arch),self.installdir.dir)+'\n')
-     else:
-@@ -369,11 +378,15 @@ prepend-path PATH %s
+@@ -370,10 +379,17 @@ prepend-path PATH %s
          includes.extend(i.include)
          self.addMakeMacro(i.PACKAGE.replace('-','_')+'_INCLUDE',self.headers.toStringNoDupes(i.include))
      self.packagelibs = libs
-+
 +    if self.sharedLibraries.petsclibExt:
 +      self.petsclibExt=self.sharedLibraries.petsclibExt
-+
      if self.framework.argDB['with-single-library']:
--      self.alllibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),' -lpetsc']+libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs)+' '+self.compilers.LIBS
-+      self.alllibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),' -lpetsc'+self.petsclibExt]+libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs)+' '+self.compilers.LIBS
-       self.addMakeMacro('PETSC_WITH_EXTERNAL_LIB',self.alllibs)
+       self.petsclib = '-lpetsc'
      else:
--      self.alllibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),'-lpetscts -lpetscsnes -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsys']+libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs)+' '+self.compilers.LIBS
-+      self.alllibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),'-lpetscts'+self.petsclibExt+' -lpetscsnes'+self.petsclibExt+' -lpetscksp'+self.petsclibExt+' -lpetscdm'+self.petsclibExt+' -lpetscmat'+self.petsclibExt+' -lpetscvec'+self.petsclibExt+' -lpetscsys'+self.petsclibExt]+libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs)+' '+self.compilers.LIBS
-     self.PETSC_EXTERNAL_LIB_BASIC = self.libraries.toStringNoDupes(libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs)+' '+self.compilers.LIBS
+       self.petsclib = '-lpetscts -lpetscsnes -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsys'
++    if self.petsclibExt:
++      petsclibs = ''
++      for mylib in self.petsclib.split():
++        petsclibs += mylib+self.petsclibExt+' '
++      self.petsclib = petsclibs.strip()
+     self.alllibs = self.libraries.toStringNoDupes(['-L'+os.path.join(self.petscdir.dir,self.arch.arch,'lib'), self.petsclib]+libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs)+' '+self.compilers.LIBS
+     self.PETSC_EXTERNAL_LIB_BASIC = self.libraries.toStringNoDupes(libs+self.libraries.math+self.compilers.flibs+self.compilers.cxxlibs+self.compilers.LIBS.split())
      if self.framework.argDB['prefix'] and self.setCompilers.CSharedLinkerFlag not in ['-L']:
-       lib_basic = self.PETSC_EXTERNAL_LIB_BASIC.replace(self.setCompilers.CSharedLinkerFlag+os.path.join(self.petscdir.dir,self.arch.arch,'lib'),self.setCompilers.CSharedLinkerFlag+os.path.join(self.installdir.dir,'lib'))
-@@ -392,14 +405,17 @@ prepend-path PATH %s
+@@ -393,14 +409,17 @@ prepend-path PATH %s
      self.addMakeMacro('DESTDIR',self.installdir.dir)
      self.addDefine('LIB_DIR','"'+os.path.join(self.installdir.dir,'lib')+'"')
  
@@ -170,21 +161,6 @@ Index: petsc/config/PETSc/Configure.py
 +      self.addMakeMacro('PETSC_KSP_LIB_BASIC','-lpetsc'+self.petsclibExt)
 +      self.addMakeMacro('PETSC_TS_LIB_BASIC','-lpetsc'+self.petsclibExt)
 +      self.addMakeMacro('PETSC_TAO_LIB_BASIC','-lpetsc'+self.petsclibExt)
+       self.addMakeMacro('PETSC_WITH_EXTERNAL_LIB',self.alllibs)
        self.addDefine('USE_SINGLE_LIBRARY', '1')
        if self.sharedlibraries.useShared:
-         self.addMakeMacro('PETSC_SYS_LIB','${C_SH_LIB_PATH} ${PETSC_WITH_EXTERNAL_LIB}')
-@@ -474,10 +490,12 @@ prepend-path PATH %s
-       self.setCompilers.pushLanguage('FC')
-       fd.write('\"Using Fortran linker: %s\\n\"\n' % (escape(self.setCompilers.getLinker())))
-       self.setCompilers.popLanguage()
-+    if self.sharedLibraries.petsclibExt:
-+      self.petsclibExt=self.sharedLibraries.petsclibExt
-     if self.framework.argDB['with-single-library']:
--      petsclib = '-lpetsc'
-+      petsclib = '-lpetsc'+self.petsclibExt
-     else:
--      petsclib = '-lpetscts -lpetscsnes -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsys'
-+      petsclib = '-lpetscts'+self.petsclibExt+' -lpetscsnes'+self.petsclibExt+' -lpetscksp'+self.petsclibExt+' -lpetscdm'+self.petsclibExt+' -lpetscmat'+self.petsclibExt+' -lpetscvec'+self.petsclibExt+' -lpetscsys'+self.petsclibExt
-     fd.write('\"Using libraries: %s%s -L%s %s %s\\n\"\n' % (escape(self.setCompilers.CSharedLinkerFlag), escape(os.path.join(self.petscdir.dir, self.arch.arch, 'lib')), escape(os.path.join(self.petscdir.dir, self.arch.arch, 'lib')), escape(petsclib), escape(self.PETSC_EXTERNAL_LIB_BASIC)))
-     fd.write('\"-----------------------------------------\\n\";\n')
-     fd.close()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git