Skip to content

Commit

Permalink
Stop shipping a pre-compiled ibverbs.c
Browse files Browse the repository at this point in the history
Only EL6 needed this, lets just make a new enough Cython in the docker
container so it can be built instead.

Building the .c with newer versions of the IB headers results in a module
that is un-buildable on older distros anyhow due to new IBV constants.
  • Loading branch information
jgunthorpe committed Sep 1, 2015
1 parent 0bb5186 commit 6b10903
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 37,872 deletions.
2 changes: 0 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ PACKAGE = $(firstword $(shell dh_listpackages))
TMP = $(CURDIR)/debian/$(PACKAGE)

override_dh_auto_build:
# Force rebuild of cython output for Debian
rm rdma/ibverbs.c
dh_auto_build
python setup.py docs

Expand Down
5 changes: 5 additions & 0 deletions docker/build-centos-6.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,8 @@ RUN yum install -y \
rpm-build \
tar \
&& yum clean all

ADD http://vault.centos.org/7.1.1503/os/Source/SPackages/Cython-0.19-3.el7.src.rpm /tmp/
RUN rpmbuild --rebuild /tmp/Cython-0.19-3.el7.src.rpm && \
rpm -U /root/rpmbuild/RPMS/x86_64/Cython-0.19-3.el6.x86_64.rpm && \
rm -rf /root/rpmbuild
5 changes: 0 additions & 5 deletions python-rdma.spec
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ BuildRequires: gcc
BuildRequires: libibverbs-devel
BuildRequires: python-devel
BuildRequires: python-sphinx
%if 0%{?rhel} >= 7
BuildRequires: Cython
%endif

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

Expand All @@ -39,9 +37,6 @@ libraries to provide ibverbs functionality.
echo "__git_head__ = '"`zcat %{sources} | git get-tar-commit-id`"'" >> rdma/__init__.py

%build
%if 0%{?rhel} >= 7
rm rdma/ibverbs.c
%endif
env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
python setup.py docs

Expand Down
Loading

0 comments on commit 6b10903

Please sign in to comment.