diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /sci-mathematics/petsc/files | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'sci-mathematics/petsc/files')
-rw-r--r-- | sci-mathematics/petsc/files/petsc-3.7.0-disable-rpath.patch | 18 | ||||
-rw-r--r-- | sci-mathematics/petsc/files/petsc-3.9.0-fix_sandbox_violation.patch | 17 |
2 files changed, 35 insertions, 0 deletions
diff --git a/sci-mathematics/petsc/files/petsc-3.7.0-disable-rpath.patch b/sci-mathematics/petsc/files/petsc-3.7.0-disable-rpath.patch new file mode 100644 index 000000000000..8d0d993309bc --- /dev/null +++ b/sci-mathematics/petsc/files/petsc-3.7.0-disable-rpath.patch @@ -0,0 +1,18 @@ +diff --git a/config/BuildSystem/config/setCompilers.py b/config/BuildSystem/config/setCompilers.py +index 219a35b..ad2ed8c 100644 +--- a/config/BuildSystem/config/setCompilers.py ++++ b/config/BuildSystem/config/setCompilers.py +@@ -1385,12 +1385,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(self.log): +- 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(), self.log): + testFlags.insert(0,'-R') + for testFlag in testFlags: diff --git a/sci-mathematics/petsc/files/petsc-3.9.0-fix_sandbox_violation.patch b/sci-mathematics/petsc/files/petsc-3.9.0-fix_sandbox_violation.patch new file mode 100644 index 000000000000..97f8dfed4d71 --- /dev/null +++ b/sci-mathematics/petsc/files/petsc-3.9.0-fix_sandbox_violation.patch @@ -0,0 +1,17 @@ +diff --git a/config/PETSc/options/installDir.py b/config/PETSc/options/installDir.py +index 92f190d..047c85b 100644 +--- a/config/PETSc/options/installDir.py ++++ b/config/PETSc/options/installDir.py +@@ -41,12 +41,6 @@ class Configure(config.base.Configure): + self.dir = os.path.abspath(os.path.expanduser(self.framework.argDB['prefix'])) + self.petscDir = self.dir + self.petscArch = '' +- 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.petscDir = self.petscdir.dir |