[adios] 129/207: Don't build with ibverbs on some systems
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository adios.
commit 68c44bcb573f7c700ee49df770fa7a35d7ccc244
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed May 21 19:57:37 2014 +0100
Don't build with ibverbs on some systems
---
debian/control | 5 +++--
debian/rules | 12 +++++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index dcf9875..3994d1f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: science
Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
Build-Depends: debhelper (>= 9), libnetcdf-dev, gfortran, libhdf5-mpi-dev | libhdf5-dev, libmxml-dev,
- mpi-default-dev, autotools-dev, cmake, libbz2-dev, libibverbs-dev, zlib1g-dev,
+ mpi-default-dev, autotools-dev, cmake, libbz2-dev, zlib1g-dev,
+ libibverbs-dev [ !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
python-dev, python-numpy, python3-mpi4py, cython, dh-python,
python3-dev, python3-numpy, python3-mpi4py, cython3
Standards-Version: 3.9.5
@@ -58,7 +59,7 @@ Description: Python interace to the ADIOS IO system
.
Package: python3-adios
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends}
Section: python
Architecture: any
Provides: ${python:Provides}
diff --git a/debian/rules b/debian/rules
index 642422f..08e96fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ endif
ARCH:=$(shell dpkg --print-architecture)
WITH_LUSTRE :=
+WITH_IBVERBS:= --with-ibverbs=/usr
DO_TEST:= true
# Do tests on little-endian only for the moment;
@@ -38,6 +39,15 @@ endif
ifeq ($(ARCH), mips)
DO_TEST:= false
endif
+ifeq ($(ARCH),hurd-i386)
+ WITH_IBVERBS:=
+endif
+ifeq ($(ARCH),kfreebsd-amd64)
+ WITH_IBVERBS:=
+endif
+ifeq ($(ARCH),kfreebsd-i386)
+ WITH_IBVERBS:=
+endif
DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
@@ -61,7 +71,7 @@ override_dh_auto_clean:
rm -f debian/python3-adios.install
override_dh_auto_configure:
- dh_auto_configure -- $(WITH_LUSTRE) --enable-shared \
+ dh_auto_configure -- $(WITH_LUSTRE) $(WITH_IBVERBS) --enable-shared \
--with-hdf5=/usr --with-bzip2=/usr --with-zlib=/usr --prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS='-fPIC'
# Prep python wrapper. Cache these for cmake otherwise it will get 2.7, 3.* confused
mkdir -p wrappers/numpy/build_$(PY2)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list