[SCM] mpich.git branch, master, updated. debian/1.4.1-4-28-g077eb9b
Anton Gladky
gladky.anton at gmail.com
Tue Jun 18 20:02:17 UTC 2013
The following commit has been merged in the master branch:
commit 58db27a601302bd4497d2df896b098e63052f09f
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Tue Jun 18 21:54:31 2013 +0200
Move to dh 9
Use autoreconf
Clean debian/rules
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f9ee3ed..b11597f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Torquil Macdonald Sørensen <torquil at gmail.com>, "Adam C. Powell, IV" <hazelsct at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, gfortran, txt2man, libxt-dev, x11proto-core-dev, default-jdk, quilt, procps, libhwloc-dev, hwloc-nox, libcr-dev [amd64 armel i386 powerpc], automake, valgrind [i386 amd64 powerpc armel armhf]
+Build-Depends: debhelper (>= 9), gfortran, txt2man, libxt-dev, x11proto-core-dev, default-jdk, quilt, procps, libhwloc-dev, hwloc-nox, libcr-dev [amd64 armel i386 powerpc], automake, valgrind [i386 amd64 powerpc armel armhf], dh-autoreconf
Standards-Version: 3.9.2
Homepage: http://www.mpich.org/
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/mpich.git;a=summary
@@ -92,17 +92,3 @@ Description: Development files for MPICH
.
This package includes the MPICH headers and static libraries, as well
as the compiler wrappers needed to build MPICH programs.
-
-#Package: libmpe-mpich2-dev
-#Architecture: any
-#Section: libdevel
-#Depends: mpich2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-#Description: Analysis tools for MPICH2 programs
-# This is an implementation of the Message-Passing Interface (MPI). The goals of
-# MPICH2 are to provide an MPI implementation for important platforms, including
-# clusters, SMPs, and massively parallel processors. It also provides a vehicle
-# for MPI implementation research and for developing new and better parallel
-# programming environments.
-# .
-# This package includes the MPE environment, which provides a complete suite of
-# analysis tools for MPI programs based on port processing approach.
diff --git a/debian/libmpe-mpich2-dev.docs b/debian/libmpe-mpich2-dev.docs
deleted file mode 100644
index a0b18dc..0000000
--- a/debian/libmpe-mpich2-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/doc/jumpshot-4/usersguide.pdf
-debian/tmp/usr/share/doc/jumpshot-4/html
diff --git a/debian/libmpe-mpich2-dev.install b/debian/libmpe-mpich2-dev.install
deleted file mode 100644
index 4d4dfeb..0000000
--- a/debian/libmpe-mpich2-dev.install
+++ /dev/null
@@ -1,17 +0,0 @@
-etc/mpich2/mpe*
-usr/include/mpich2/mpe*
-usr/include/mpich2/clog*
-usr/share/man/man4
-usr/lib/*mpe*
-usr/lib/clog*
-usr/lib/slog*
-usr/lib/log*
-usr/lib/jumpshot*
-usr/lib/trace*
-usr/sbin/mpe*
-usr/bin/slog*
-usr/bin/mpe*
-usr/bin/jumpshot
-usr/bin/log*
-usr/bin/clog*
-usr/bin/check_callstack
diff --git a/debian/libmpich-dev.install b/debian/libmpich-dev.install
index adb68e3..c90c188 100644
--- a/debian/libmpich-dev.install
+++ b/debian/libmpich-dev.install
@@ -1,16 +1,16 @@
etc/mpich/mpi*.conf
-usr/bin/mpicc
+usr/bin/mpicc.*
usr/bin/mpichversion
-usr/bin/mpicxx
-usr/bin/mpif77
-usr/bin/mpif90
-usr/lib/lib*mpich*.a
-usr/lib/lib*mpich*.so
-usr/lib/lib*opa*a
-usr/lib/lib*opa*so
-usr/lib/lib*mpl*.a
-usr/lib/lib*mpl*.so
-usr/lib/pkgconfig/mpich*.pc
+usr/bin/mpicxx.*
+usr/bin/mpif77.*
+usr/bin/mpif90.*
+usr/lib/*/lib*mpich*.a
+usr/lib/*/lib*mpich*.so
+usr/lib/*/lib*opa*a
+usr/lib/*/lib*opa*so
+usr/lib/*/lib*mpl*.a
+usr/lib/*/lib*mpl*.so
+usr/lib/*/pkgconfig/mpich*.pc
usr/include/mpich/opa*
usr/include/mpich/mpi*
usr/include/mpich/primitives/
diff --git a/debian/libmpich-dev.links b/debian/libmpich-dev.links
index d757689..efd5593 100644
--- a/debian/libmpich-dev.links
+++ b/debian/libmpich-dev.links
@@ -1,2 +1,4 @@
usr/share/man/man1/mpicxx.1.gz /usr/share/man/man1/mpic++.1.gz
usr/include/mpich usr/lib/mpich/include
+usr/bin/mpicxx.mpich usr/bin/mpic++.mpich
+usr/share/man/man1/mpicxx.mpich.1 /usr/share/man/man1/mpic++.mpich.1
diff --git a/debian/libmpich10.install b/debian/libmpich10.install
index c46df8e..3ded4cc 100644
--- a/debian/libmpich10.install
+++ b/debian/libmpich10.install
@@ -1,6 +1,6 @@
-usr/lib/libmpich.so.10*
-usr/lib/libfmpich.so.10*
-usr/lib/libmpichcxx.so.10*
-usr/lib/libmpichf90.so.10*
-usr/lib/libmpl.so.1*
-usr/lib/libopa.so.1*
+usr/lib/*/libmpich.so.10*
+usr/lib/*/libfmpich.so.10*
+usr/lib/*/libmpichcxx.so.10*
+usr/lib/*/libmpichf90.so.10*
+usr/lib/*/libmpl.so.1*
+usr/lib/*/libopa.so.1*
diff --git a/debian/mpich.dirs b/debian/mpich.dirs
new file mode 100644
index 0000000..99859fa
--- /dev/null
+++ b/debian/mpich.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/sbin
+etc/mpich
+usr/share/man/man4
diff --git a/debian/mpich.links b/debian/mpich.links
new file mode 100644
index 0000000..81e6a73
--- /dev/null
+++ b/debian/mpich.links
@@ -0,0 +1 @@
+usr/share/man/man1/mpiexec.mpich.1 /usr/share/man/man1/mpirun.mpich.1
diff --git a/debian/rules b/debian/rules
index 3c08c30..6d718c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,15 @@
#! /usr/bin/make -f
+%:
+ dh $@ --parallel --with autoreconf
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+export MPICHLIB_CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+export MPICHLIB_CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
+export MPICHLIB_FFLAGS=$(shell dpkg-buildflags --get FFLAGS)
+export MPICHLIB_FCFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+export FC=gfortran
+export F77=gfortran
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-DEB_CONFIGURE_SCRIPT_ENV += MPICHLIB_CFLAGS="$(CFLAGS)" CFLAGS=""
-DEB_CONFIGURE_SCRIPT_ENV += MPICHLIB_CXXFLAGS="$(CXXFLAGS)" CXXFLAGS=""
-DEB_CONFIGURE_SCRIPT_ENV += MPICHLIB_FFLAGS="$(FFLAGS)" FFLAGS=""
-DEB_CONFIGURE_SCRIPT_ENV += MPICHLIB_FCFLAGS="$(FCFLAGS)" FCFLAGS=""
-DEB_CONFIGURE_SCRIPT_ENV += FC="gfortran"
-
-DEB_CONFIGURE_EXTRA_FLAGS := \
+extra_flags += \
--enable-shared \
--prefix=/usr \
--enable-fc \
@@ -27,67 +21,30 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
# BLCR checkpointing support
ifneq (,$(findstring $(DEB_HOST_ARCH),amd64 armel i386 powerpc))
- DEB_CONFIGURE_EXTRA_FLAGS += --enable-checkpointing --with-hydra-ckpointlib=blcr
+ extra_flags += --enable-checkpointing --with-hydra-ckpointlib=blcr
endif
# On sparc and sh4, OPA isn't available, so we need to fallback to
# emulation mode. There's a performance penalty, unfortunately.
ifneq (,$(findstring $(DEB_HOST_GNU_CPU),sparc sh4))
- DEB_CONFIGURE_EXTRA_FLAGS += --with-atomic-primitives=no
+ extra_flags += --with-atomic-primitives=no
endif
-DEB_MAKE_CLEAN_TARGET := distclean
-
-# run MPI test suite
-# Custom rules based on the makefile CDBS class
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-common-build-arch common-build-indep:: debian/stamp-makefile-testing
-debian/stamp-makefile-testing: debian/stamp-makefile-build
- bash debian/run-tests.bash
- touch $@
-
-makefile-clean::
- rm -f debian/stamp-makefile-testing
-endif
+override_dh_auto_configure:
+ dh_auto_configure -- $(extra_flags)
-# do some post-installation renamings
-binary-install/libmpich-dev::
+override_dh_auto_install-arch:
+ dh_auto_install -a
for i in mpicc mpicxx mpif77 mpif90; do \
- (cd debian/libmpich-dev/usr/bin/ && mv $$i $$i.mpich); \
- (cd debian/libmpich-dev/usr/share/man/man1/ && mv $$i.1 $$i.mpich.1);\
- done
- rm -f debian/libmpich-dev/usr/lib/libopa.la
- rm -f debian/libmpich-dev/usr/bin/mpic++ debian/libmpich-dev/usr/share/man/man1/mpic++.1
- dh_link -plibmpich-dev /usr/bin/mpicxx.mpich /usr/bin/mpic++.mpich
- dh_link -plibmpich-dev /usr/share/man/man1/mpicxx.mpich.1 /usr/share/man/man1/mpic++.mpich.1
- for i in debian/libmpich-dev/usr/lib/*.so ; do \
- dh_link -plibmpich-dev usr/lib/`basename $$i` usr/lib/mpich/lib/`basename $$i` ;\
+ (cd debian/tmp/usr/bin/ && mv $$i $$i.mpich); \
+ (cd debian/tmp/usr/share/man/man1/ && mv $$i.1 $$i.mpich.1);\
done
# Fix incorrect paths in /etc/mpich/*.conf and /usr/bin/mpi{cc,cxx,f77,f90}.mpich
- for fn in debian/libmpich-dev/etc/mpich/*.conf debian/libmpich-dev/usr/bin/mpicc.mpich \
- debian/libmpich-dev/usr/bin/mpicxx.mpich debian/libmpich-dev/usr/bin/mpif77.mpich \
- debian/libmpich-dev/usr/bin/mpif90.mpich; do \
+ for fn in debian/tmp/etc/mpich/*.conf debian/tmp/usr/bin/mpicc.mpich \
+ debian/tmp/usr/bin/mpicxx.mpich debian/tmp/usr/bin/mpif77.mpich \
+ debian/tmp/usr/bin/mpif90.mpich; do \
sed -i 's:$(CURDIR)/debian/tmp/::g' $$fn ;\
done
-
-binary-install/mpich::
- mv debian/mpich/usr/bin/mpiexec debian/mpich/usr/bin/mpiexec.mpich
- mv debian/mpich/usr/bin/mpirun debian/mpich/usr/bin/mpirun.mpich
- mv debian/mpich/usr/share/man/man1/mpiexec.1 debian/mpich/usr/share/man/man1/mpiexec.mpich.1
- dh_link -pmpich /usr/share/man/man1/mpiexec.mpich.1 /usr/share/man/man1/mpirun.mpich.1
-
-# hacks to work around missing directory creation in mpeinstall
-common-install-prehook-impl::
- mkdir -p debian/tmp/usr/bin
- mkdir -p debian/tmp/usr/sbin
- mkdir -p debian/tmp/etc/mpich
- mkdir -p debian/tmp//usr/share/man/man4
-
-list-missing-mine:
- (cd debian/tmp && find . -type f -exec md5sum {} \+ | grep -v '/DEBIAN/') > debian/tmp-files
- (for package in $(DEB_ALL_PACKAGES); do \
- (cd debian/$$package && find . -type f -exec md5sum {} \+ | grep -v '/DEBIAN/'); done) > debian/pkg-files
- awk '{print $$1}' debian/tmp-files > debian/tmp-files-md5
- awk '{print $$1}' debian/pkg-files > debian/pkg-files-md5
- for i in $$(combine debian/tmp-files-md5 not debian/pkg-files-md5); do \
- grep $$i debian/tmp-files; done
+ mv debian/tmp/usr/bin/mpiexec debian/tmp/usr/bin/mpiexec.mpich
+ mv debian/tmp/usr/bin/mpirun debian/tmp/usr/bin/mpirun.mpich
+ mv debian/tmp/usr/share/man/man1/mpiexec.1 debian/tmp/usr/share/man/man1/mpiexec.mpich.1
--
mpich.git
More information about the debian-science-commits
mailing list