r45378 - in /packages/code-aster/aster/trunk/debian: config-mpi_32.txt config-mpi_64.txt rules
apalazzi-guest at users.alioth.debian.org
apalazzi-guest at users.alioth.debian.org
Fri Oct 5 19:44:14 UTC 2012
Author: apalazzi-guest
Date: Fri Oct 5 19:44:13 2012
New Revision: 45378
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45378
Log:
Modified mpi config files to build with gcc-4.6 and gfortran-4.6
Modified:
packages/code-aster/aster/trunk/debian/config-mpi_32.txt
packages/code-aster/aster/trunk/debian/config-mpi_64.txt
packages/code-aster/aster/trunk/debian/rules
Modified: packages/code-aster/aster/trunk/debian/config-mpi_32.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi_32.txt?rev=45378&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_32.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_32.txt Fri Oct 5 19:44:13 2012
@@ -58,21 +58,21 @@
PYTHON | python | 2.4 | /usr/bin/pythonPYVER
#
LINK | link | ? | /usr/bin/mpicc
-OPTL | link | ? |
+OPTL | link | ? | MPICC_LINK_FLAGS
#
-CC | cc | ? | /usr/bin/mpicc
-OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC
-OPTC_O | cc | ? | -c -O2 -fno-tree-dse -fno-stack-protector -fPIC
+CC | cc | ? | /usr/bin/gcc-4.6
+OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC MPICC_COMPILE_FLAGS
+OPTC_O | cc | ? | -c -O2 -fno-tree-dse -fno-stack-protector -fPIC MPICC_COMPILE_FLAGS
INCL | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include -I/usr/include/mpi
#
-F77 | f77 | ? | /usr/bin/mpif77
-OPTF_D | f77 | ? | -c -g -fPIC
-OPTF_O | f77 | ? | -c -O2 -fno-tree-dse -fPIC
+F77 | f77 | ? | /usr/bin/gfortran-4.6
+OPTF_D | f77 | ? | -c -g -fPIC MPIF77_COMPILE_FLAGS
+OPTF_O | f77 | ? | -c -O2 -fno-tree-dse -fPIC MPIF77_COMPILE_FLAGS
INCLF | include | ? | -I/usr/include -I/usr/include/mpi
#
-F90 | f90 | ? | /usr/bin/mpif90
-OPTF90_D | f90 | ? | -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC
-OPTF90_O | f90 | ? | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fPIC
+F90 | f90 | ? | /usr/bin/gfortran-4.6
+OPTF90_D | f90 | ? | -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC MPIF90_COMPILE_FLAGS
+OPTF90_O | f90 | ? | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fPIC MPIF90_COMPILE_FLAGS
INCLF90 | include | ? | -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.9.2_mpi -I/usr/include -I/usr/include/mpi
#
G77_AGLA | g77 | ? | unused
Modified: packages/code-aster/aster/trunk/debian/config-mpi_64.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi_64.txt?rev=45378&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_64.txt Fri Oct 5 19:44:13 2012
@@ -57,22 +57,22 @@
#
PYTHON | python | 2.4 | /usr/bin/pythonPYVER
#
-LINK | link | ? | /usr/bin/mpicc
-OPTL | link | ? |
+LINK | link | ? | /usr/bin/gcc-4.6
+OPTL | link | ? | MPICC_LINK_FLAGS
#
-CC | cc | ? | /usr/bin/mpicc
-OPTC_D | cc | ? | -v -c -g -fno-stack-protector -fPIC
-OPTC_O | cc | ? | -v -c -O2 -fno-tree-dse -fno-stack-protector -fPIC
+CC | cc | ? | /usr/bin/gcc-4.6
+OPTC_D | cc | ? | -v -c -g -fno-stack-protector -fPIC MPICC_COMPILE_FLAGS
+OPTC_O | cc | ? | -v -c -O2 -fno-tree-dse -fno-stack-protector -fPIC MPICC_COMPILE_FLAGS
INCL | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include -I/usr/include/mpi
#
-F77 | f77 | ? | /usr/bin/mpif77
-OPTF_D | f77 | ? | -v -c -g -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTF_O | f77 | ? | -v -c -O2 -fno-tree-dse -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+F77 | f77 | ? | /usr/bin/gfortran-4.6
+OPTF_D | f77 | ? | -v -c -g -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF77_COMPILE_FLAGS
+OPTF_O | f77 | ? | -v -c -O2 -fno-tree-dse -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF77_COMPILE_FLAGS
INCLF | include | ? | -I/usr/include -I/usr/include/mpi
#
-F90 | f90 | ? | /usr/bin/mpif90
-OPTF90_D | f90 | ? | -v -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTF90_O | f90 | ? | -v -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+F90 | f90 | ? | /usr/bin/gfortran-4.6
+OPTF90_D | f90 | ? | -v -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF90_COMPILE_FLAGS
+OPTF90_O | f90 | ? | -v -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF90_COMPILE_FLAGS
INCLF90 | include | ? | -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.9.2_mpi -I/usr/include -I/usr/include/mpi
#
G77_AGLA | g77 | ? | unused
Modified: packages/code-aster/aster/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/rules?rev=45378&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Fri Oct 5 19:44:13 2012
@@ -9,6 +9,11 @@
HOSTNAME ?= $(shell hostname)
PYVERS := $(shell pyversions -vr debian/control)
+
+MPICC_COMPILE_FLAGS ?= $(shell mpicc --showme:compile)
+MPIF77_COMPILE_FLAGS ?= $(shell mpif77 --showme:compile)
+MPIF90_COMPILE_FLAGS ?= $(shell mpif90 --showme:compile)
+MPICC_LINK_FLAGS ?= $(shell mpicc --showme:link)
STA_UPSTREAM_VERSION=STA10.7
STA_VERSION=STABLE
@@ -90,6 +95,10 @@
perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|DEB_DESTDIR|$(DEB_DESTDIR)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|ASTER_ROOT|$(ASTER_ROOT)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|MPICC_COMPILE_FLAGS|$(MPICC_COMPILE_FLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|MPIF77_COMPILE_FLAGS|$(MPIF77_COMPILE_FLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|MPIF90_COMPILE_FLAGS|$(MPIF90_COMPILE_FLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|MPICC_LINK_FLAGS|$(MPICC_LINK_FLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make clean --vers=$(PTA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/dtag; \
python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make --vers=$(PTA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
More information about the debian-science-commits
mailing list