summaryrefslogtreecommitdiff
path: root/french/aster/files/patch-setup.py
diff options
context:
space:
mode:
Diffstat (limited to 'french/aster/files/patch-setup.py')
-rw-r--r--french/aster/files/patch-setup.py22
1 files changed, 18 insertions, 4 deletions
diff --git a/french/aster/files/patch-setup.py b/french/aster/files/patch-setup.py
index 36d2936826e4..5c86f10a8eb2 100644
--- a/french/aster/files/patch-setup.py
+++ b/french/aster/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig 2008-12-23 18:01:02.000000000 +0100
-+++ setup.py 2009-01-04 17:54:20.000000000 +0100
-@@ -296,6 +296,14 @@
+--- ./setup.py.orig 2010-02-09 10:04:59.000000000 +0100
++++ ./setup.py 2010-02-11 23:32:34.000000000 +0100
+@@ -318,6 +318,14 @@
cfg['ARCH'] = 'x86_64'
else:
cfg['IFDEF'] = 'LINUX'
@@ -15,7 +15,21 @@
elif sys.platform[:4] == 'osf1':
cfg['IFDEF']='TRU64'
elif sys.platform == 'sunos5':
-@@ -509,6 +517,7 @@
+@@ -442,13 +450,6 @@
+ if not type(math_lib) in (list, tuple):
+ math_lib = [math_lib,]
+ sys_lib = []
+- for glob_lib in ('pthread', 'z',):
+- cfg['__tmp__'] = ''
+- del cfg['__tmp__']
+- ftools.findlib_and_set(cfg, '__tmp__', glob_lib, prefshared=True, err=False, silent=False)
+- if cfg.get('__tmp__'):
+- ftools.AddToCache('lib', glob_lib, cfg['__tmp__'])
+- sys_lib.append(glob_lib)
+
+ # 1.4.2. ----- check for compilers
+ cfg_ini = cfg.copy()
+@@ -541,6 +542,7 @@
# and modify command line of those which don't have a --display= option
ListEdit=[
['nedit' , 'nedit',],