kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade Code_Aster to 9.4.0.

Browse source
This commit is contained in:
Thierry Thomas 2009-01-14 20:25:37 +00:00
parent b4dc3ef3f1
commit 21a1598dce
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=226119
7 changed files with 972 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
french/aster/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= aster
DISTVERSIONPREFIX= full-src-
DISTVERSION= 9.3.0-2
DISTVERSION= 9.4.0-1
DISTVERSIONSUFFIX= .noarch
CATEGORIES= french cad
MASTER_SITES= http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
@ -79,9 +79,6 @@ FFLAGARCH= -fdefault-integer-8 -fdefault-real-8
.if ${OSVERSION} < 700000
BROKEN= does not install
.endif
#.if ${ARCH} != "i386"
#BROKEN= Seg. fault on ${ARCH} during compilation of elements.
#.endif
.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
WITH_ATLAS= yes
@ -135,7 +132,7 @@ MUMPS_PORT= mumps
BUILD_DEPENDS+= ${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
MUMPS_PORT= mumps-mpich
MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/mpich2/lib -lmpich
MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/mpich2/lib -lmpich
. endif
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcmumps.a:${PORTSDIR}/math/${MUMPS_PORT}
.endif
@ -146,8 +143,6 @@ HOME_MPI= ${LOCALBASE}/mpich2
.endif
USE_FORTRAN= yes
FORTRANLIBDIR= `${DIRNAME} \`${FC} -print-libgcc-file-name\``
FORTRANLIBDIR2= `${DIRNAME} \`${FC} -print-libgcc-file-name\``/../../../
TK_VER?= 8.4
SHORT_TK_VER= ${TK_VER:S/.//}
@ -222,6 +217,12 @@ ASTKDIR= ${LOCALBASE}/${LASTKDIR}
${WRKSRC}/instdir/${vaster}/elements: build
pre-everything::
.if defined(WITH_MPI)
@${ECHO_MSG} "To build Code_Aster with MPI enabled, you nedd to run `mpd &'"
@${ECHO_MSG} "and may be you have to run `ldconfig -R ${LOCALBASE}/mpich2/lib'"
.endif
pre-configure:
${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|' ${WRKSRC}/setup.cfg
${REINPLACE_CMD} -e 's|/opt/aster|${WRKSRC}/instdir|' \
@ -288,14 +289,25 @@ pre-configure:
${ECHO_CMD} "LDFLAGS='-v ${LDFLAGS}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "FFLAGS='-c ${FFLAGS} ${FLAGARCH} ${FFLAGARCH}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "FFLAGS_DBG='-c -g -O ${FLAGARCH} ${FFLAGARCH}'" >> ${WRKSRC}/setup.cfg
.if defined(WITH_MPI)
${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \
>> ${WRKSRC}/setup.cfg
${ECHO_CMD} "F90FLAGS_DBG='-c -g -O ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \
>> ${WRKSRC}/setup.cfg
${ECHO_CMD} "CFLAGS='-c ${CFLAGS} -fno-stack-protector ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \
>> ${WRKSRC}/setup.cfg
${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe -fno-stack-protector ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \
>> ${WRKSRC}/setup.cfg
.else
${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include'" \
>> ${WRKSRC}/setup.cfg
${ECHO_CMD} "F90FLAGS_DBG='-c -g -O ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include'" \
>> ${WRKSRC}/setup.cfg
${ECHO_CMD} "CFLAGS='-c ${CFLAGS} -fno-stack-protector ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include'" \
>> ${WRKSRC}/setup.cfg
${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe -fno-stack-protector ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include'" \
>> ${WRKSRC}/setup.cfg
.endif
.for is in ${INTERACTIVE_SCRIPTS}
${REINPLACE_CMD} -e '/should_continue()/d' \
${WRKSRC}/${is}
@ -311,16 +323,18 @@ do-configure:
@${ECHO_MSG} "------------ Fin debug ------------------"
pre-build:
${MKDIR} ${WRKSRC}/instdir/ASTK/ASTK_SERV/conf ${WRKSRC}/instdir/outils
${MKDIR} ${WRKSRC}/instdir/ASTK/ASTK_SERV/conf \
${WRKSRC}/instdir/ASTK/ASTK_SERV/lib \
${WRKSRC}/instdir/outils
${SED} -e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|' \
< ${LOCALBASE}/aster/ASTK/ASTK_SERV/conf/config \
> ${WRKSRC}/instdir/ASTK/ASTK_SERV/conf/config
${CP} ${LOCALBASE}/aster/ASTK/ASTK_SERV/conf/aster_profile.sh \
${WRKSRC}/instdir/ASTK/ASTK_SERV/conf
${LN} -sf ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin \
${WRKSRC}/instdir/ASTK/ASTK_SERV
${LN} -sf ${LOCALBASE}/aster/ASTK/ASTK_SERV/lib \
${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin \
${WRKSRC}/instdir/ASTK/ASTK_SERV
${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/lib \
${WRKSRC}/instdir/ASTK/ASTK_SERV/
do-build:
(cd ${BUILD_WRKSRC} && \
@ -366,6 +380,9 @@ post-install:
.endif
.if !defined(WITHOUT_EFICAS)
${LN} -fs ${LOCALBASE}/bin/eficas ${tools_dir}/
. if exists(${LOCALBASE}/bin/qtEficas)
${LN} -fs ${LOCALBASE}/bin/qtEficas ${tools_dir}/
. endif
.endif
.if !defined(WITHOUT_GMSH)
${LN} -fs ${LOCALBASE}/bin/gmsh ${tools_dir}/
@ -384,11 +401,11 @@ post-install:
.if defined(MAINTAINER_MODE)
regression-test: install
@${ECHO_CMD} Note: homard must be installed to run some steps succesfully.
@${ECHO_MSG} "Note: homard must be installed to run some steps succesfully."
(cd ${inst_dir}; \
HDF5_DISABLE_VERSION_CHECK=1 \
${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run astout.export)
@${ECHO_CMD} Check ${inst_dir}/astest/*.erre
@${ECHO_MSG} "Check ${inst_dir}/astest/*.erre"
.endif
.include <bsd.port.post.mk>

6
french/aster/distinfo
View file

@ -1,3 +1,3 @@
MD5 (aster-full-src-9.3.0-2.noarch.tar.gz) = ad4e5476fb4a1d3f02fcbaeebc54356c
SHA256 (aster-full-src-9.3.0-2.noarch.tar.gz) = 53c5ea87cd21549b6bb7d2a5a51e79b082a3df2daaeb0fd2774d0a5696ca9d2d
SIZE (aster-full-src-9.3.0-2.noarch.tar.gz) = 141387488
MD5 (aster-full-src-9.4.0-1.noarch.tar.gz) = b6dbe112250aac2cf569da9ebf30b18b
SHA256 (aster-full-src-9.4.0-1.noarch.tar.gz) = c475bca33c12ed0e1dcf7ff82f424aac87bf6968c820b5789d90842b1de5b107
SIZE (aster-full-src-9.4.0-1.noarch.tar.gz) = 149931937

48
french/aster/files/patch-check_compilers.py
View file

@ -1,34 +1,28 @@
--- check_compilers.py.orig 2008-07-03 18:50:57.000000000 +0200
+++ check_compilers.py 2008-07-08 00:01:13.000000000 +0200
@@ -290,7 +290,7 @@
if self.platform == 'LINUX64':
self.F77 = 'gfortran'
- self.libs.extend([('math', 'lapack'), ('math', 'blas'), ('math', 'g2c'),
+ self.libs.extend([('math', 'lapack'), ('math', 'blas'), ('math', 'f2c'),
('cxx', ['libstdc++.so', 'libstdc++.a']),])
#-------------------------------------------------------------------------------
@@ -332,7 +332,7 @@
if self.platform == 'LINUX64':
self.F77 = 'gfortran'
- self.libs.extend([('math', 'g2c'),
+ self.libs.extend([('math', 'f2c'),
('cxx', ['libstdc++.so', 'libstdc++.a']),])
#-------------------------------------------------------------------------------
@@ -356,6 +356,13 @@
self.profiles.append('mklvars64.sh')
--- check_compilers.py.orig 2008-12-23 18:01:02.000000000 +0100
+++ check_compilers.py 2009-01-04 16:59:06.000000000 +0100
@@ -394,7 +394,7 @@
args='-ffree-form -fdefault-integer-8', src=trivial_src['F90'])
self.fcheck(self.is_F77_is_gfortran, 'F77 (%s) is gfortran' % self.cfg.get('F77', '?'))
if True or not self.is_F77_is_gfortran: # on ne sait pas si les blas/lapack en ont besoin, le tester
- self.libs.append(('math', 'g2c'))
+ self.libs.append(('math', 'f2c'))
self.find_libs(lib=self.libs[-1])
if self.cfg.get('F90') or self.is_F77_is_gfortran:
self.libs.append(('math', 'gfortran'))
@@ -487,6 +487,16 @@
else: # x86_64
self.profiles.append('mklvarsem64t.sh')
intel_arch = 'intel64'
mkl_src_name = 'mklvarsem64t.sh'
+ elif self.platform == 'FREEBSD': # Not yet tested with icc!
+ if self.arch == 'ia64': # ia64
+ self.profiles.append('mklvars64.sh')
+ intel_arch = 'ia64'
+ mkl_src_name = 'mklvars64.sh'
+ elif self.arch == 'x86_64': # x86_64
+ self.profiles.append('mklvarsem64t.sh')
+ intel_arch = 'ia64'
+ mkl_src_name = 'mklvars64.sh'
+ else: # 32 bits
+ self.profiles.append('mklvars32.sh')
+ intel_arch = 'ia32'
+ mkl_src_name = 'mklvars32.sh'
else:
raise CheckCompilerError, _('Unsupported platform : %s') % self.platform

46
french/aster/files/patch-products.py
View file

@ -1,6 +1,6 @@
--- products.py.orig 2008-07-03 18:50:57.000000000 +0200
+++ products.py 2008-07-10 21:13:03.000000000 +0200
@@ -936,16 +936,18 @@
--- products.py.orig 2008-12-23 18:01:01.000000000 +0100
+++ products.py 2009-01-04 19:56:33.000000000 +0100
@@ -931,16 +931,19 @@
'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB', 'PYMODULES_PREFIX',
'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS',
'HOME_MED', 'HOME_HDF', 'HOME_CRPCRS',
@ -12,9 +12,9 @@
reqobj=['file:?HOME_ASTK?/ASTK_SERV/bin/as_run',
'file:?HOME_ASTK?/ASTK_SERV/conf/aster_profile.sh'],
set=['SYSLIB',
'MEDLIB', 'HDFLIB', 'LAPACKLIB', 'MATHLIB',
'MEDLIB', 'HDFLIB', 'MATHLIB',
'MUMPSLIB', 'ZMATLIB', 'SCOTCHLIB',
- 'LDFLAGS',
'LDFLAGS',
- 'CFLAGS', 'CFLAGS_DBG', 'CINCLUDE',
- 'FFLAGS', 'FFLAGS_DBG', 'FINCLUDE',
- 'F90FLAGS', 'F90FLAGS_DBG', 'F90INCLUDE',
@ -24,8 +24,8 @@
'NOBUILD', ],
)
cfg['ENV_SH'] = cfg.get('ENV_SH', '')
@@ -981,6 +983,19 @@
opt['FINCLUDE'] = ''
@@ -975,6 +978,19 @@
opt['FFLAGS'] = '-O2'
zmat_platform='Linux'
mpilibs.extend(['mpich'])
+ elif cfg['IFDEF']=='FREEBSD':
@ -44,24 +44,13 @@
elif cfg['IFDEF'] == 'LINUX64':
opt['SYSLIB'] = '-Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm'
opt['LDFLAGS'] = '-v'
@@ -1033,8 +1048,8 @@
opt['FINCLUDE'] = ''
# ----- F90
- opt['F90FLAGS_DBG'] = opt['FFLAGS_DBG']
- opt['F90FLAGS'] = opt['FFLAGS']
+ opt['F90FLAGS_DBG'] = cfg['F90FLAGS_DBG']
+ opt['F90FLAGS'] = cfg['F90FLAGS']
opt['F90INCLUDE']=''
# ----- check for MED and HDF5 libraries, and HDF5 includes
@@ -1071,12 +1086,15 @@
@@ -1056,12 +1072,15 @@
# ----- MUMPS
if cfg['HOME_MUMPS'] != '':
cfg['DEFINED'] += ' _HAVE_MUMPS'
- for lib in ('dmumps', 'zmumps', 'pord', 'mpiseq'):
- ftools.findlib_and_set(cfg, 'MUMPSLIB', lib,
- kargs['libdirs'], cfg['HOME_MUMPS'],
- cfg['HOME_MUMPS'],
- err=False, append=True)
- if lib == 'dmumps':
- ftools.CheckFromLastFound(cfg, 'HOME_MUMPS', 'lib')
@ -70,19 +59,28 @@
+ else:
+ for lib in ('dmumps', 'zmumps', 'pord', 'mpiseq'):
+ ftools.findlib_and_set(cfg, 'MUMPSLIB', lib,
+ kargs['libdirs'], cfg['HOME_MUMPS'],
+ cfg['HOME_MUMPS'],
+ err=False, append=True)
+ if lib == 'dmumps':
+ ftools.CheckFromLastFound(cfg, 'HOME_MUMPS', 'lib')
opt['F90INCLUDE'] += ' -I%s' % os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION'],'bibf90',cfg['INCLUDE_MUMPS'])
if cfg['HOME_MPI'] != '':
cfg['DEFINED'] += ' _USE_MPI_MUMPS'
@@ -1132,7 +1150,7 @@
kargs['libdirs'], cfg['HOME_SCOTCH'],
@@ -1102,7 +1121,7 @@
ftools.find_and_set(cfg, 'FINCLUDE', 'mpif.h',
cfg['HOME_MPI'],
typ='inc', err=False, append=True)
- opt['DEFINED'] +=' _USE_MPI _USE_MPI_FETI'
+ cfg['DEFINED'] +=' _USE_MPI _USE_MPI_FETI'
else:
opt['MPILIB']=''
@@ -1117,7 +1136,7 @@
cfg['HOME_SCOTCH'],
err=True, append=True)
if lib == 'common':
- ftools.CheckFromLastFound(cfg, 'HOME_SCOTCH', 'bin')
+ ftools.CheckFromLastFound(cfg, 'HOME_SCOTCH', 'lib')
ftools.find_and_set(cfg, 'CINCLUDE', 'scotchf.h',
kargs['incdirs'], cfg['HOME_SCOTCH'],
cfg['HOME_SCOTCH'],
typ='inc', err=True, append=True)

29
french/aster/files/patch-setup.cfg
View file

@ -1,33 +1,24 @@
--- setup.cfg.orig 2008-07-03 18:50:57.000000000 +0200
+++ setup.cfg 2008-07-06 23:13:45.000000000 +0200
@@ -33,7 +33,7 @@
# If you choose XXXX_without_MATH you must name your mathematical
# libraries in MATH_LIST.
# Example : PREFER_COMPILER='Intel_without_MATH' and MATH_LIST = ['acml']
-PREFER_COMPILER = 'Intel'
+PREFER_COMPILER = 'GNU'
# You may want to specify the values yourself by defining
# these variables : CC, F77, F90, CXX, LD, DEFINED,
# CFLAGS, FFLAGS, F90FLAGS, CXXFLAGS, LDFLAGS,
@@ -97,7 +97,7 @@
--- setup.cfg.orig 2008-12-23 18:01:02.000000000 +0100
+++ setup.cfg 2009-01-04 17:53:09.000000000 +0100
@@ -99,7 +99,7 @@
MAXDEPTH=3 # 0: not recursive (this may be long with a high depth value)
# To search for shared libraries first
-PREFER_SHARED_LIBS=False # False/True
+PREFER_SHARED_LIBS=True # False/True
# Switch to False if you prefer use 32 bits libraries on 64 bits platforms
PREFER_64BITS_LIBS=True # False/True
@@ -154,9 +154,9 @@
#-------------------------------------------------------------------------------
# Future packages : not yet used by Code_Aster !
@@ -144,9 +144,9 @@
#-------------------------------------------------------------------------------
# Interface between Code_Aster and Salome
-_install_omniORB = True
-_install_omniORBpy = True
-_install_pylotage = True
+_install_omniORB = False
+_install_omniORBpy = False
+_install_pylotage = False
+#_install_omniORB = True
+#_install_omniORBpy = True
+#_install_pylotage = True
# Salome version supported by pylotage
SALOME_VERSION = 'DEFAULT' # DEFAULT means the last one supported by pylotage

15
french/aster/files/patch-setup.py
View file

@ -1,5 +1,5 @@
--- setup.py.orig 2008-07-03 18:50:57.000000000 +0200
+++ setup.py 2008-07-08 00:05:35.000000000 +0200
--- 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 @@
cfg['ARCH'] = 'x86_64'
else:
@ -15,16 +15,7 @@
elif sys.platform[:4] == 'osf1':
cfg['IFDEF']='TRU64'
elif sys.platform == 'sunos5':
@@ -406,7 +414,7 @@
if not type(math_lib) in (list, tuple):
math_lib = [math_lib,]
sys_lib = []
- for glob_lib in ('pthread', 'g2c', 'z',):
+ for glob_lib in ('pthread', 'f2c', 'z',):
cfg['__tmp__'] = ''
del cfg['__tmp__']
ftools.findlib_and_set(cfg, '__tmp__', glob_lib, libdirs, [], prefshared=True,
@@ -502,6 +510,7 @@
@@ -509,6 +517,7 @@
# and modify command line of those which don't have a --display= option
ListEdit=[
['nedit' , 'nedit',],

928
french/aster/pkg-plist
View file

File diff suppressed because it is too large Load diff