diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2014-05-13 21:48:27 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2014-05-13 21:48:27 +0000 |
| commit | 22e22d5b926f24a7d2951e9180ecfbc71da3a832 (patch) | |
| tree | 019d21d12803f847d7407dda3358516aeea19b01 /french/aster/files/patch-as_setup.py | |
| parent | 1- Upgrade to 4.10.0: this version is required by french/aster; (diff) | |
Fix several problems: it now builds cleanly and can run the tests.
Still marked BROKEN because there is some rough edges, but interesting
users can remove this line.
Notes
Notes:
svn path=/head/; revision=354003
Diffstat (limited to 'french/aster/files/patch-as_setup.py')
| -rw-r--r-- | french/aster/files/patch-as_setup.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/french/aster/files/patch-as_setup.py b/french/aster/files/patch-as_setup.py index 2e0f4f597dc4..aee47c47b94f 100644 --- a/french/aster/files/patch-as_setup.py +++ b/french/aster/files/patch-as_setup.py @@ -1,5 +1,5 @@ ---- as_setup.py.orig 2014-01-06 14:30:14.000000000 +0100 -+++ as_setup.py 2014-01-17 23:16:39.000000000 +0100 +--- as_setup.py.orig 2014-03-05 09:41:19.000000000 +0100 ++++ as_setup.py 2014-05-12 19:32:12.000000000 +0200 @@ -45,6 +45,8 @@ import compileall import imp @@ -9,22 +9,18 @@ import distutils.sysconfig as SC from subprocess import Popen, PIPE -@@ -516,6 +518,42 @@ +@@ -516,6 +518,46 @@ if iextr_as: self.Clean(to_delete=path) + # Insert FreeBSD patches here + file2patch = os.path.join(self.workdir, self.content, 'bibc/wscript') -+ self._print('FreeBSD patch: no libdl + -O2 (GCC Bug 51267) => modify ' + file2patch) ++ self._print('FreeBSD patch: no libdl => modify ' + file2patch) + for ligne in fileinput.input(file2patch, inplace=1): + nl = 0 + nl = string.find(ligne, "uselib_store='SYS', lib='dl'") + if nl > 0: + ligne =ligne.replace("self.check_cc", "# self.check_cc") -+ else: -+ nl = string.find(ligne, "-O2") -+ if nl > 0: -+ ligne =ligne.replace("-O2", "-O0") + sys.stdout.write(ligne) + file2patch = os.path.join(self.workdir, self.content, 'bibc/utilitai/hpalloc.c') + self._print('FreeBSD patch: stdlib + no mallopt => modify ' + file2patch) @@ -47,6 +43,14 @@ + if nl > 0: + ligne =ligne.replace("-O2", "-O0") + sys.stdout.write(ligne) ++ file2patch = os.path.join(self.workdir, self.content, 'bibc/utilitai/mempid.c') ++ self._print('FreeBSD patch: VmData VmSize and VmPeak in /proc/%pid%/status ' + file2patch) ++ for ligne in fileinput.input(file2patch, inplace=1): ++ nl = 0 ++ nl = string.find(ligne, "/proc") ++ if nl > 0: ++ ligne =ligne.replace("/proc", "/compat/linux/proc") ++ sys.stdout.write(ligne) + # End of FreeBSD patches + #------------------------------------------------------------------------------- |