diff options
Diffstat (limited to 'french/aster/files/patch-as_setup.py')
| -rw-r--r-- | french/aster/files/patch-as_setup.py | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/french/aster/files/patch-as_setup.py b/french/aster/files/patch-as_setup.py index 0836f467c458..ed00e8f64ef9 100644 --- a/french/aster/files/patch-as_setup.py +++ b/french/aster/files/patch-as_setup.py @@ -1,4 +1,4 @@ ---- as_setup.py.orig 2016-09-07 08:44:22 UTC +--- as_setup.py.orig 2017-08-26 13:56:41 UTC +++ as_setup.py @@ -45,6 +45,8 @@ import tarfile import compileall @@ -17,7 +17,7 @@ self._print(self._fmt_title % _('Extraction')) if kargs.get('external')<>None: self._call_external(**kargs) -@@ -518,6 +521,60 @@ class SETUP: +@@ -518,6 +521,76 @@ class SETUP: if iextr_as: self.Clean(to_delete=path) @@ -73,6 +73,22 @@ + if nl > 0: + ligne =ligne.replace("'hdf5'", "'hdf5-18'") + sys.stdout.write(ligne) ++ file2patch = os.path.join(self.workdir, self.content, 'waf') ++ self._print('FreeBSD patch: /bin/bash => modify ' + file2patch) ++ for ligne in fileinput.input(file2patch, inplace=1): ++ nl = 0 ++ nl = string.find(ligne, "/bin/bash") ++ if nl > 0: ++ ligne =ligne.replace("/bin/bash", " %%LOCALBASE%%/bin/bash") ++ sys.stdout.write(ligne) ++ file2patch = os.path.join(self.workdir, self.content, 'waftools/mathematics.py') ++ self._print('FreeBSD patch: nproc => gnproc ' + file2patch) ++ for ligne in fileinput.input(file2patch, inplace=1): ++ nl = 0 ++ nl = string.find(ligne, "'nproc'") ++ if nl > 0: ++ ligne =ligne.replace("'nproc'", "'gnproc'") ++ sys.stdout.write(ligne) + # End of FreeBSD patches + #------------------------------------------------------------------------------- |