summaryrefslogtreecommitdiff
path: root/french/aster/files/patch-products.py
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2014-03-18 21:09:03 +0000
committerThierry Thomas <thierry@FreeBSD.org>2014-03-18 21:09:03 +0000
commit55e6556d123a5c0c057d2c0a9b645123225b50a6 (patch)
treebee32239c442ebaba930b9099409230b15af97f7 /french/aster/files/patch-products.py
parent- Add pwhois user in preparation for new pwhois port (diff)
Upgrade Code_Aster to 11.5.0-4.
N.B.: french/aster is still marked BROKEN, but this allows to unbreak other ports sharing the same dependencies. Patch for french/med provided by tijl.
Notes
Notes: svn path=/head/; revision=348597
Diffstat (limited to 'french/aster/files/patch-products.py')
-rw-r--r--french/aster/files/patch-products.py60
1 files changed, 9 insertions, 51 deletions
diff --git a/french/aster/files/patch-products.py b/french/aster/files/patch-products.py
index c3bffc46b845..7c0e9052efc7 100644
--- a/french/aster/files/patch-products.py
+++ b/french/aster/files/patch-products.py
@@ -1,54 +1,12 @@
---- products.py.orig 2013-01-28 13:35:55.000000000 +0100
-+++ products.py 2013-03-17 21:30:27.000000000 +0100
-@@ -995,9 +995,10 @@
+--- products.py.orig 2014-03-05 09:41:19.000000000 +0100
++++ products.py 2014-03-17 18:39:24.000000000 +0100
+@@ -701,7 +701,8 @@
'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB',
'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS',
- 'HOME_MED', 'HOME_HDF', 'HOME_CRPCRS', 'HOME_NUMPY', 'USE_NUMPY',
-- 'LD', 'CC', 'F77', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ],
-- reqobj=['file:?ASTER_ROOT?/bin/as_run',
-- 'file:?ASTER_ROOT?/etc/codeaster/profile.sh'],
-+ 'LD', 'CC', 'F77', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', 'CFLAGS',
+ 'HOME_MED', 'HOME_HDF',
+- 'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ],
++ 'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', 'CFLAGS', 'LDFLAGS',
+ 'CFLAGS_DBG', 'FFLAGS', 'FFLAGS_DBG','F90FLAGS', 'F90FLAGS_DBG', 'CXXLIB', ],
-+ reqobj=['file:/usr/ports/french/aster/work/aster-full-src-10.8.0/instdir/bin/as_run',
-+ 'file:/usr/ports/french/aster/work/aster-full-src-10.8.0/instdir/etc/codeaster/profile.sh'],
- set=['MEDLIB', 'HDFLIB', 'MATHLIB',
- 'MUMPSLIB', 'ZMATLIB', 'SCOTCHLIB',
- 'CINCLUDE', 'FINCLUDE', 'F90INCLUDE',
-@@ -1043,6 +1044,19 @@
- if cfg['IFDEF'] in ('LINUX', 'P_LINUX'):
- zmat_platform = 'Linux'
- mpilibs.extend(['mpich'])
-+ elif cfg['IFDEF']=='FREEBSD':
-+ # Don't check gfortran, already part of SYSLIB
-+ opt['MATH_LIST'] = [cfg['LAPACKLIB'], cfg['BLASLIB']]
-+ opt['SYSLIB'] = cfg['SYSLIB']
-+ opt['LDFLAGS'] = cfg['LDFLAGS']
-+ opt['CFLAGS_DBG'] = cfg['CFLAGS_DBG']
-+ opt['CFLAGS'] = cfg['CFLAGS']
-+ opt['FFLAGS_DBG'] = cfg['FFLAGS_DBG']
-+ opt['FFLAGS'] = cfg['FFLAGS']
-+ opt['FINCLUDE'] = ''
-+ cxxlibs.extend(['stdc++', 'supc++'])
-+ zmat_platform=''
-+ mpilibs.extend(['mpich', 'mpl'])
- elif cfg['IFDEF'] == 'LINUX64':
- mpilibs.extend(['mpich'])
- # others have not been tested !
-@@ -1097,11 +1111,12 @@
-
- # ----- libs c++ (for MED and ZMAT)
- #XXX probably to remove (done by check_compiler)
-- if cfg['HOME_MED'] != '' or cfg['HOME_ZMAT'] != '':
-- for lib in cxxlibs:
-- ftools.findlib_and_set(cfg, 'CXXLIB', lib,
-- [cfg['HOME_MED'], cfg['HOME_ZMAT']],
-- err=False, append=True, maxdepth=max(ftools.maxdepth,10))
-+ # CXXLIB already set for FreeBSD
-+ #if cfg['HOME_MED'] != '' or cfg['HOME_ZMAT'] != '':
-+ # for lib in cxxlibs:
-+ # ftools.findlib_and_set(cfg, 'CXXLIB', lib,
-+ # [cfg['HOME_MED'], cfg['HOME_ZMAT']],
-+ # err=False, append=True, maxdepth=max(ftools.maxdepth,10))
-
- # ----- METIS
- if cfg.get('METISLIB'):
+ reqobj=['file:?ASTER_ROOT?/bin/as_run',
+ 'file:?ASTER_ROOT?/etc/codeaster/profile.sh'],
+ )