From 7942c05fe297d82b7f4a1e81282aaa9b3bfb406a Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 30 Aug 2018 22:25:26 -0500 Subject: sci-mathematics/petsc: remove obsolete patches Package-Manager: Portage-2.3.48, Repoman-2.3.10 --- .../petsc/files/petsc-3.5.3-disable-rpath.patch | 18 ------------------ .../petsc/files/petsc-3.6.0-disable-rpath.patch | 17 ----------------- .../files/petsc-3.6.0-fix_sandbox_violation.patch | 15 --------------- .../files/petsc-3.7.0-fix_sandbox_violation.patch | 17 ----------------- 4 files changed, 67 deletions(-) delete mode 100644 sci-mathematics/petsc/files/petsc-3.5.3-disable-rpath.patch delete mode 100644 sci-mathematics/petsc/files/petsc-3.6.0-disable-rpath.patch delete mode 100644 sci-mathematics/petsc/files/petsc-3.6.0-fix_sandbox_violation.patch delete mode 100644 sci-mathematics/petsc/files/petsc-3.7.0-fix_sandbox_violation.patch (limited to 'sci-mathematics/petsc/files') diff --git a/sci-mathematics/petsc/files/petsc-3.5.3-disable-rpath.patch b/sci-mathematics/petsc/files/petsc-3.5.3-disable-rpath.patch deleted file mode 100644 index 7fe3760c9..000000000 --- a/sci-mathematics/petsc/files/petsc-3.5.3-disable-rpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/config/BuildSystem/config/setCompilers.py b/config/BuildSystem/config/setCompilers.py -index 8e0d2ee..ce53ad0 100644 ---- a/config/BuildSystem/config/setCompilers.py -+++ b/config/BuildSystem/config/setCompilers.py -@@ -1326,12 +1326,7 @@ class Configure(config.base.Configure): - for language in languages: - flag = '-L' - self.pushLanguage(language) -- # test '-R' before '-rpath' as sun compilers [c,fortran] don't give proper errors with wrong options. -- if not Configure.isDarwin(): -- testFlags = ['-Wl,-rpath,', '-R','-rpath ' , '-Wl,-R,'] -- else: -- testFlags = [] -- # test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux accepts -Wl,-rpath, but f90 & CC do not. -+ testFlags = [] - if self.isSun(self.framework.getCompiler()): - testFlags.insert(0,'-R') - for testFlag in testFlags: diff --git a/sci-mathematics/petsc/files/petsc-3.6.0-disable-rpath.patch b/sci-mathematics/petsc/files/petsc-3.6.0-disable-rpath.patch deleted file mode 100644 index 88a7db565..000000000 --- a/sci-mathematics/petsc/files/petsc-3.6.0-disable-rpath.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/config/BuildSystem/config/setCompilers.py b/config/BuildSystem/config/setCompilers.py ---- a/config/BuildSystem/config/setCompilers.py -+++ b/config/BuildSystem/config/setCompilers.py -@@ -1326,12 +1326,7 @@ class Configure(config.base.Configure): - for language in languages: - flag = '-L' - self.pushLanguage(language) -- # test '-R' before '-rpath' as sun compilers [c,fortran] don't give proper errors with wrong options. -- if not Configure.isDarwin(): -- testFlags = ['-Wl,-rpath,', '-R','-rpath ' , '-Wl,-R,'] -- else: -- testFlags = ['-Wl,-rpath,'] -- # test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux accepts -Wl,-rpath, but f90 & CC do not. -+ testFlags = [] - if self.isSun(self.framework.getCompiler()): - testFlags.insert(0,'-R') - for testFlag in testFlags: diff --git a/sci-mathematics/petsc/files/petsc-3.6.0-fix_sandbox_violation.patch b/sci-mathematics/petsc/files/petsc-3.6.0-fix_sandbox_violation.patch deleted file mode 100644 index 7510631a1..000000000 --- a/sci-mathematics/petsc/files/petsc-3.6.0-fix_sandbox_violation.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- config/PETSc/options/installDir.py.orig 2015-06-23 18:11:25.054911894 +0200 -+++ config/PETSc/options/installDir.py 2015-06-23 18:11:44.100289841 +0200 -@@ -38,12 +38,6 @@ - self.installSudoMessage = '' - if self.framework.argDB['prefix']: - self.dir = self.framework.argDB['prefix'] -- try: -- os.makedirs(os.path.join(self.dir,'PETScTestDirectory')) -- os.rmdir(os.path.join(self.dir,'PETScTestDirectory')) -- except: -- self.installSudoMessage = 'You do not have write permissions to the --prefix directory '+self.dir+'\nYou will be prompted for the sudo password for any external package installs' -- self.installSudo = 'sudo ' - else: - self.dir = os.path.abspath(os.path.join(self.petscdir.dir, self.arch.arch)) - self.confDir = os.path.abspath(os.path.join(self.petscdir.dir, self.arch.arch)) diff --git a/sci-mathematics/petsc/files/petsc-3.7.0-fix_sandbox_violation.patch b/sci-mathematics/petsc/files/petsc-3.7.0-fix_sandbox_violation.patch deleted file mode 100644 index 191ca18c4..000000000 --- a/sci-mathematics/petsc/files/petsc-3.7.0-fix_sandbox_violation.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/config/PETSc/options/installDir.py b/config/PETSc/options/installDir.py -index 0e2567c..bf782b5 100644 ---- a/config/PETSc/options/installDir.py -+++ b/config/PETSc/options/installDir.py -@@ -38,12 +38,6 @@ class Configure(config.base.Configure): - self.installSudoMessage = '' - if self.framework.argDB['prefix']: - self.dir = os.path.abspath(os.path.expanduser(self.framework.argDB['prefix'])) -- try: -- os.makedirs(os.path.join(self.dir,'PETScTestDirectory')) -- os.rmdir(os.path.join(self.dir,'PETScTestDirectory')) -- except: -- self.installSudoMessage = 'You do not have write permissions to the --prefix directory '+self.dir+'\nYou will be prompted for the sudo password for any external package installs' -- self.installSudo = 'sudo ' - else: - self.dir = os.path.abspath(os.path.join(self.petscdir.dir, self.arch.arch)) - self.confDir = os.path.abspath(os.path.join(self.petscdir.dir, self.arch.arch)) -- cgit v1.2.3-65-gdbad