aboutsummaryrefslogtreecommitdiff
path: root/french/aster/files/patch-as_setup.py
diff options
context:
space:
mode:
Diffstat (limited to 'french/aster/files/patch-as_setup.py')
-rw-r--r--french/aster/files/patch-as_setup.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/french/aster/files/patch-as_setup.py b/french/aster/files/patch-as_setup.py
index ba6d291d68b7..7d349c06c04a 100644
--- a/french/aster/files/patch-as_setup.py
+++ b/french/aster/files/patch-as_setup.py
@@ -17,7 +17,7 @@
self._print(self._fmt_title % _('Extraction'))
if kargs.get('external')!=None:
self._call_external(**kargs)
-@@ -518,6 +521,78 @@ class SETUP:
+@@ -518,6 +521,81 @@ class SETUP:
if iextr_as:
self.Clean(to_delete=path)
@@ -81,8 +81,11 @@
+ ligne =ligne.replace("getopt ", "getopts ")
+ sys.stdout.write(ligne)
+ self._print('FreeBSD patches: waf.engine and data/post_install in %s' % os.path.join(self.workdir, self.content))
-+ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < /usr/ports/french/aster/work/post_patches/post-patch-waf.engine')
-+ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < /usr/ports/french/aster/work/post_patches/post-patch-data__post_install')
++ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-waf.engine')
++ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-data__post_install')
++ self._print('FreeBSD patches: memory detection in bibc/utilitai/mempid.c in %s' % os.path.join(self.workdir, self.content))
++ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-bibc__utilitai__mempid.c')
++ os.system('cd ' + os.path.join(self.workdir, self.content) + ' && patch -p0 < %%WRKDIR%%/post_patches/post-patch-bibfor__jeveux__jedebu.F90')
+ 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):
@@ -96,7 +99,7 @@
#-------------------------------------------------------------------------------
def Configure(self, **kargs):
"""Configuration of the product.
-@@ -1454,7 +1529,7 @@ class SYSTEM:
+@@ -1454,7 +1532,7 @@ class SYSTEM:
if type(profile) is str:
ftmp = osp.join(self._tmpdir, 'temp.opt_env')
open(ftmp, 'w').write(profile)