[Pkg-openmpi-commits] r294 - in /openmpi/trunk/debian: changelog control libopenmpi2.install.armel libopenmpi2.install.armhf patches/configure_arm_fix.patch patches/series rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Tue Jan 24 16:07:13 UTC 2012
Author: sylvestre
Date: Tue Jan 24 16:07:08 2012
New Revision: 294
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=294
Log:
* Build for armhf as well.
* Add armel/armhf specific libopenmpi2.install files.
* debian/patches/configure_arm_fix.patch: Fix arm FTBFS.
Added:
openmpi/trunk/debian/libopenmpi2.install.armel
openmpi/trunk/debian/libopenmpi2.install.armhf
openmpi/trunk/debian/patches/configure_arm_fix.patch
Modified:
openmpi/trunk/debian/changelog
openmpi/trunk/debian/control
openmpi/trunk/debian/patches/series
openmpi/trunk/debian/rules
Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=294&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Tue Jan 24 16:07:08 2012
@@ -1,9 +1,15 @@
-openmpi (1.5.4-2) UNRELEASED; urgency=low
-
+openmpi (1.5.4-2~exp1) experimental; urgency=low
+
+ [ Manuel Prinz ]
* Moved all CR components from libopenmpi2 to openmpi-checkpoint. Fixes the
build issue on ia64.
- -- Manuel Prinz <manuel at debian.org> Fri, 13 Jan 2012 20:35:30 +0100
+ [ Jani Monoses ]
+ * Build for armhf as well.
+ * Add armel/armhf specific libopenmpi2.install files.
+ * debian/patches/configure_arm_fix.patch: Fix arm FTBFS.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 24 Jan 2012 16:34:52 +0100
openmpi (1.5.4-1) experimental; urgency=low
Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=294&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Tue Jan 24 16:07:08 2012
@@ -4,7 +4,7 @@
Homepage: http://www.open-mpi.org/
Maintainer: Debian Open MPI Maintainers <pkg-openmpi-maintainers at lists.alioth.debian.org>
Uploaders: Manuel Prinz <manuel at debian.org>, Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 8.0.0~), libibverbs-dev (>= 1.1.1), gfortran, gcc (>= 4:4.1.2), chrpath, quilt, libcr-dev [amd64 armel i386 powerpc], libnuma-dev [amd64 i386 ia64 mips mipsel powerpc], autoconf (>= 2.59), automake1.10, libtool, libltdl-dev, libhwloc-dev, libtorque2-dev
+Build-Depends: debhelper (>= 8.0.0~), libibverbs-dev (>= 1.1.1), gfortran, gcc (>= 4:4.1.2), chrpath, quilt, libcr-dev [amd64 armel armhf i386 powerpc], libnuma-dev [amd64 i386 ia64 mips mipsel powerpc], autoconf (>= 2.59), automake1.10, libtool, libltdl-dev, libhwloc-dev, libtorque2-dev
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
@@ -12,7 +12,7 @@
Package: openmpi-bin
Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-common (= ${source:Version})
-Suggests: gfortran, openmpi-checkpoint [amd64 armel i386 powerpc]
+Suggests: gfortran, openmpi-checkpoint [amd64 armel armhf i386 powerpc]
Description: high performance message passing library -- binaries
Open MPI is a project combining technologies and resources from several other
projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
@@ -115,7 +115,7 @@
This package contains debugging symbols for Open MPI.
Package: openmpi-checkpoint
-Architecture: amd64 armel i386 powerpc
+Architecture: amd64 armel armhf i386 powerpc
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin (= ${binary:Version}), blcr-util
Description: high performance message passing library -- checkpoint support
Open MPI is a project combining technologies and resources from several other
Added: openmpi/trunk/debian/libopenmpi2.install.armel
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi2.install.armel?rev=294&op=file
==============================================================================
--- openmpi/trunk/debian/libopenmpi2.install.armel (added)
+++ openmpi/trunk/debian/libopenmpi2.install.armel Tue Jan 24 16:07:08 2012
@@ -1,0 +1,97 @@
+## Shared libraries
+usr/lib/openmpi/lib/libmca_common_sm.so.2.0.0
+usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.2
+usr/lib/openmpi/lib/libmpi_f90.so.1.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.2
+usr/lib/openmpi/lib/libompitrace.so.0.0.0
+usr/lib/openmpi/lib/libopen-pal.so.3.0.0
+usr/lib/openmpi/lib/libopen-rte.so.3.0.0
+## Plugins
+usr/lib/openmpi/lib/openmpi/libompi_dbg_msgq.so
+usr/lib/openmpi/lib/openmpi/mca_allocator_basic.so
+usr/lib/openmpi/lib/openmpi/mca_allocator_bucket.so
+usr/lib/openmpi/lib/openmpi/mca_bml_r2.so
+usr/lib/openmpi/lib/openmpi/mca_btl_ofud.so
+usr/lib/openmpi/lib/openmpi/mca_btl_openib.so
+usr/lib/openmpi/lib/openmpi/mca_btl_self.so
+usr/lib/openmpi/lib/openmpi/mca_btl_sm.so
+usr/lib/openmpi/lib/openmpi/mca_btl_tcp.so
+usr/lib/openmpi/lib/openmpi/mca_carto_auto_detect.so
+usr/lib/openmpi/lib/openmpi/mca_carto_file.so
+usr/lib/openmpi/lib/openmpi/mca_coll_basic.so
+usr/lib/openmpi/lib/openmpi/mca_coll_hierarch.so
+usr/lib/openmpi/lib/openmpi/mca_coll_inter.so
+usr/lib/openmpi/lib/openmpi/mca_coll_self.so
+usr/lib/openmpi/lib/openmpi/mca_coll_sm.so
+usr/lib/openmpi/lib/openmpi/mca_coll_sync.so
+usr/lib/openmpi/lib/openmpi/mca_coll_tuned.so
+usr/lib/openmpi/lib/openmpi/mca_crcp_bkmrk.so
+usr/lib/openmpi/lib/openmpi/mca_crs_none.so
+usr/lib/openmpi/lib/openmpi/mca_crs_self.so
+usr/lib/openmpi/lib/openmpi/mca_dpm_orte.so
+usr/lib/openmpi/lib/openmpi/mca_errmgr_default.so
+usr/lib/openmpi/lib/openmpi/mca_ess_env.so
+usr/lib/openmpi/lib/openmpi/mca_ess_hnp.so
+usr/lib/openmpi/lib/openmpi/mca_ess_singleton.so
+usr/lib/openmpi/lib/openmpi/mca_ess_slave.so
+usr/lib/openmpi/lib/openmpi/mca_ess_slurmd.so
+usr/lib/openmpi/lib/openmpi/mca_ess_slurm.so
+usr/lib/openmpi/lib/openmpi/mca_ess_tm.so
+usr/lib/openmpi/lib/openmpi/mca_ess_tool.so
+usr/lib/openmpi/lib/openmpi/mca_filem_rsh.so
+usr/lib/openmpi/lib/openmpi/mca_grpcomm_bad.so
+usr/lib/openmpi/lib/openmpi/mca_grpcomm_basic.so
+usr/lib/openmpi/lib/openmpi/mca_grpcomm_hier.so
+usr/lib/openmpi/lib/openmpi/mca_iof_hnp.so
+usr/lib/openmpi/lib/openmpi/mca_iof_orted.so
+usr/lib/openmpi/lib/openmpi/mca_iof_tool.so
+usr/lib/openmpi/lib/openmpi/mca_maffinity_first_use.so
+usr/lib/openmpi/lib/openmpi/mca_mpool_fake.so
+usr/lib/openmpi/lib/openmpi/mca_mpool_rdma.so
+usr/lib/openmpi/lib/openmpi/mca_mpool_sm.so
+usr/lib/openmpi/lib/openmpi/mca_notifier_command.so
+usr/lib/openmpi/lib/openmpi/mca_notifier_syslog.so
+usr/lib/openmpi/lib/openmpi/mca_odls_default.so
+usr/lib/openmpi/lib/openmpi/mca_oob_tcp.so
+usr/lib/openmpi/lib/openmpi/mca_osc_pt2pt.so
+usr/lib/openmpi/lib/openmpi/mca_osc_rdma.so
+usr/lib/openmpi/lib/openmpi/mca_paffinity_hwloc.so
+usr/lib/openmpi/lib/openmpi/mca_plm_rshd.so
+usr/lib/openmpi/lib/openmpi/mca_plm_rsh.so
+usr/lib/openmpi/lib/openmpi/mca_plm_slurm.so
+usr/lib/openmpi/lib/openmpi/mca_plm_tm.so
+usr/lib/openmpi/lib/openmpi/mca_pml_bfo.so
+usr/lib/openmpi/lib/openmpi/mca_pml_cm.so
+usr/lib/openmpi/lib/openmpi/mca_pml_crcpw.so
+usr/lib/openmpi/lib/openmpi/mca_pml_csum.so
+usr/lib/openmpi/lib/openmpi/mca_pml_ob1.so
+usr/lib/openmpi/lib/openmpi/mca_pml_v.so
+usr/lib/openmpi/lib/openmpi/mca_pubsub_orte.so
+usr/lib/openmpi/lib/openmpi/mca_ras_cm.so
+usr/lib/openmpi/lib/openmpi/mca_ras_gridengine.so
+usr/lib/openmpi/lib/openmpi/mca_ras_slurm.so
+usr/lib/openmpi/lib/openmpi/mca_ras_tm.so
+usr/lib/openmpi/lib/openmpi/mca_rcache_vma.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_load_balance.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_rank_file.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_resilient.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_round_robin.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_seq.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_topo.so
+usr/lib/openmpi/lib/openmpi/mca_rmcast_tcp.so
+usr/lib/openmpi/lib/openmpi/mca_rmcast_udp.so
+usr/lib/openmpi/lib/openmpi/mca_rml_ftrm.so
+usr/lib/openmpi/lib/openmpi/mca_rml_oob.so
+usr/lib/openmpi/lib/openmpi/mca_routed_binomial.so
+usr/lib/openmpi/lib/openmpi/mca_routed_cm.so
+usr/lib/openmpi/lib/openmpi/mca_routed_direct.so
+usr/lib/openmpi/lib/openmpi/mca_routed_linear.so
+usr/lib/openmpi/lib/openmpi/mca_routed_radix.so
+usr/lib/openmpi/lib/openmpi/mca_routed_slave.so
+usr/lib/openmpi/lib/openmpi/mca_snapc_full.so
+usr/lib/openmpi/lib/openmpi/mca_sysinfo_linux.so
+usr/lib/openmpi/lib/openmpi/mca_topo_unity.so
+usr/lib/openmpi/lib/openmpi/mca_vprotocol_pessimist.so
+## Other files
+usr/lib/openmpi/lib/mpi.mod
Added: openmpi/trunk/debian/libopenmpi2.install.armhf
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi2.install.armhf?rev=294&op=file
==============================================================================
--- openmpi/trunk/debian/libopenmpi2.install.armhf (added)
+++ openmpi/trunk/debian/libopenmpi2.install.armhf Tue Jan 24 16:07:08 2012
@@ -1,0 +1,97 @@
+## Shared libraries
+usr/lib/openmpi/lib/libmca_common_sm.so.2.0.0
+usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.2
+usr/lib/openmpi/lib/libmpi_f90.so.1.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.2
+usr/lib/openmpi/lib/libompitrace.so.0.0.0
+usr/lib/openmpi/lib/libopen-pal.so.3.0.0
+usr/lib/openmpi/lib/libopen-rte.so.3.0.0
+## Plugins
+usr/lib/openmpi/lib/openmpi/libompi_dbg_msgq.so
+usr/lib/openmpi/lib/openmpi/mca_allocator_basic.so
+usr/lib/openmpi/lib/openmpi/mca_allocator_bucket.so
+usr/lib/openmpi/lib/openmpi/mca_bml_r2.so
+usr/lib/openmpi/lib/openmpi/mca_btl_ofud.so
+usr/lib/openmpi/lib/openmpi/mca_btl_openib.so
+usr/lib/openmpi/lib/openmpi/mca_btl_self.so
+usr/lib/openmpi/lib/openmpi/mca_btl_sm.so
+usr/lib/openmpi/lib/openmpi/mca_btl_tcp.so
+usr/lib/openmpi/lib/openmpi/mca_carto_auto_detect.so
+usr/lib/openmpi/lib/openmpi/mca_carto_file.so
+usr/lib/openmpi/lib/openmpi/mca_coll_basic.so
+usr/lib/openmpi/lib/openmpi/mca_coll_hierarch.so
+usr/lib/openmpi/lib/openmpi/mca_coll_inter.so
+usr/lib/openmpi/lib/openmpi/mca_coll_self.so
+usr/lib/openmpi/lib/openmpi/mca_coll_sm.so
+usr/lib/openmpi/lib/openmpi/mca_coll_sync.so
+usr/lib/openmpi/lib/openmpi/mca_coll_tuned.so
+usr/lib/openmpi/lib/openmpi/mca_crcp_bkmrk.so
+usr/lib/openmpi/lib/openmpi/mca_crs_none.so
+usr/lib/openmpi/lib/openmpi/mca_crs_self.so
+usr/lib/openmpi/lib/openmpi/mca_dpm_orte.so
+usr/lib/openmpi/lib/openmpi/mca_errmgr_default.so
+usr/lib/openmpi/lib/openmpi/mca_ess_env.so
+usr/lib/openmpi/lib/openmpi/mca_ess_hnp.so
+usr/lib/openmpi/lib/openmpi/mca_ess_singleton.so
+usr/lib/openmpi/lib/openmpi/mca_ess_slave.so
+usr/lib/openmpi/lib/openmpi/mca_ess_slurmd.so
+usr/lib/openmpi/lib/openmpi/mca_ess_slurm.so
+usr/lib/openmpi/lib/openmpi/mca_ess_tm.so
+usr/lib/openmpi/lib/openmpi/mca_ess_tool.so
+usr/lib/openmpi/lib/openmpi/mca_filem_rsh.so
+usr/lib/openmpi/lib/openmpi/mca_grpcomm_bad.so
+usr/lib/openmpi/lib/openmpi/mca_grpcomm_basic.so
+usr/lib/openmpi/lib/openmpi/mca_grpcomm_hier.so
+usr/lib/openmpi/lib/openmpi/mca_iof_hnp.so
+usr/lib/openmpi/lib/openmpi/mca_iof_orted.so
+usr/lib/openmpi/lib/openmpi/mca_iof_tool.so
+usr/lib/openmpi/lib/openmpi/mca_maffinity_first_use.so
+usr/lib/openmpi/lib/openmpi/mca_mpool_fake.so
+usr/lib/openmpi/lib/openmpi/mca_mpool_rdma.so
+usr/lib/openmpi/lib/openmpi/mca_mpool_sm.so
+usr/lib/openmpi/lib/openmpi/mca_notifier_command.so
+usr/lib/openmpi/lib/openmpi/mca_notifier_syslog.so
+usr/lib/openmpi/lib/openmpi/mca_odls_default.so
+usr/lib/openmpi/lib/openmpi/mca_oob_tcp.so
+usr/lib/openmpi/lib/openmpi/mca_osc_pt2pt.so
+usr/lib/openmpi/lib/openmpi/mca_osc_rdma.so
+usr/lib/openmpi/lib/openmpi/mca_paffinity_hwloc.so
+usr/lib/openmpi/lib/openmpi/mca_plm_rshd.so
+usr/lib/openmpi/lib/openmpi/mca_plm_rsh.so
+usr/lib/openmpi/lib/openmpi/mca_plm_slurm.so
+usr/lib/openmpi/lib/openmpi/mca_plm_tm.so
+usr/lib/openmpi/lib/openmpi/mca_pml_bfo.so
+usr/lib/openmpi/lib/openmpi/mca_pml_cm.so
+usr/lib/openmpi/lib/openmpi/mca_pml_crcpw.so
+usr/lib/openmpi/lib/openmpi/mca_pml_csum.so
+usr/lib/openmpi/lib/openmpi/mca_pml_ob1.so
+usr/lib/openmpi/lib/openmpi/mca_pml_v.so
+usr/lib/openmpi/lib/openmpi/mca_pubsub_orte.so
+usr/lib/openmpi/lib/openmpi/mca_ras_cm.so
+usr/lib/openmpi/lib/openmpi/mca_ras_gridengine.so
+usr/lib/openmpi/lib/openmpi/mca_ras_slurm.so
+usr/lib/openmpi/lib/openmpi/mca_ras_tm.so
+usr/lib/openmpi/lib/openmpi/mca_rcache_vma.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_load_balance.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_rank_file.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_resilient.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_round_robin.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_seq.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_topo.so
+usr/lib/openmpi/lib/openmpi/mca_rmcast_tcp.so
+usr/lib/openmpi/lib/openmpi/mca_rmcast_udp.so
+usr/lib/openmpi/lib/openmpi/mca_rml_ftrm.so
+usr/lib/openmpi/lib/openmpi/mca_rml_oob.so
+usr/lib/openmpi/lib/openmpi/mca_routed_binomial.so
+usr/lib/openmpi/lib/openmpi/mca_routed_cm.so
+usr/lib/openmpi/lib/openmpi/mca_routed_direct.so
+usr/lib/openmpi/lib/openmpi/mca_routed_linear.so
+usr/lib/openmpi/lib/openmpi/mca_routed_radix.so
+usr/lib/openmpi/lib/openmpi/mca_routed_slave.so
+usr/lib/openmpi/lib/openmpi/mca_snapc_full.so
+usr/lib/openmpi/lib/openmpi/mca_sysinfo_linux.so
+usr/lib/openmpi/lib/openmpi/mca_topo_unity.so
+usr/lib/openmpi/lib/openmpi/mca_vprotocol_pessimist.so
+## Other files
+usr/lib/openmpi/lib/mpi.mod
Added: openmpi/trunk/debian/patches/configure_arm_fix.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/configure_arm_fix.patch?rev=294&op=file
==============================================================================
--- openmpi/trunk/debian/patches/configure_arm_fix.patch (added)
+++ openmpi/trunk/debian/patches/configure_arm_fix.patch Tue Jan 24 16:07:08 2012
@@ -1,0 +1,16 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: openmpi-1.5.4/configure
+===================================================================
+--- openmpi-1.5.4.orig/configure 2011-08-18 16:49:03.000000000 +0300
++++ openmpi-1.5.4/configure 2012-01-20 18:12:48.959184193 +0200
+@@ -26943,7 +26943,7 @@
+ OMPI_GCC_INLINE_ASSIGN='"bis $31,$31,%0" : "=&r"(ret)'
+ ;;
+
+- armv7*)
++ arm*)
+ ompi_cv_asm_arch="ARM"
+ OPAL_ASM_SUPPORT_64BIT=1
+ OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=294&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Tue Jan 24 16:07:08 2012
@@ -5,3 +5,4 @@
#arm_support
# Link fix is obsolete, since we do not ship .la files anymore
#openmpi-link-fix
+configure_arm_fix.patch
Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=294&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Tue Jan 24 16:07:08 2012
@@ -7,7 +7,7 @@
endif
# BLCR checkpointing support
-BLCR_ARCH := "amd64 armel i386 powerpc"
+BLCR_ARCH := "amd64 armel armhf i386 powerpc"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(BLCR_ARCH)))
CHKPT = --with-ft=cr --with-blcr=/usr --with-blcr-libdir=/usr/lib
endif
More information about the Pkg-openmpi-commits
mailing list