From: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
Now that we can produce them properly, add them.
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
---
redhat/rdma-core.spec | 7 +++++++
suse/rdma-core.spec | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
index c281c5fa4e2cf9..131001051c1eee 100644
--- a/redhat/rdma-core.spec
+++ b/redhat/rdma-core.spec
@@ -73,6 +73,11 @@ Obsoletes: librdmacm-devel < %{version}-%{release}
Requires: ibacm = %{version}-%{release}
Provides: ibacm-devel = %{version}-%{release}
Obsoletes: ibacm-devel < %{version}-%{release}
+# Since our pkg-config files include private references to these packages they
+# need to have their .pc files installed too, even for dynamic linking, or
+# pkg-config breaks.
+BuildRequires: pkgconfig(libnl-3.0)
+BuildRequires: pkgconfig(libnl-route-3.0)
%description devel
RDMA core development libraries and headers.
@@ -233,6 +238,7 @@ discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
-DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
-DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
-DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \
+ -DENABLE_STATIC=1 \
%{EXTRA_CMAKE_FLAGS}
%make_jobs
@@ -352,6 +358,7 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
%dir %{_includedir}/rdma
%{_includedir}/infiniband/*
%{_includedir}/rdma/*
+%{_libdir}/lib*.a
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/ibv_*
diff --git a/suse/rdma-core.spec b/suse/rdma-core.spec
index 4bb4086cdc789b..0a0620b48e76a4 100644
--- a/suse/rdma-core.spec
+++ b/suse/rdma-core.spec
@@ -144,6 +144,12 @@ Obsoletes: librdmacm-devel < %{version}-%{release}
Provides: ibacm-devel = %{version}-%{release}
Obsoletes: ibacm-devel < %{version}-%{release}
+# Since our pkg-config files include private references to these packages they
+# need to have their .pc files installed too, even for dynamic linking, or
+# pkg-config breaks.
+BuildRequires: pkgconfig(libnl-3.0)
+BuildRequires: pkgconfig(libnl-route-3.0)
+
%description devel
RDMA core development libraries and headers.
@@ -348,6 +354,7 @@ on those changes.
-DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
-DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
-DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \
+ -DENABLE_STATIC=1 \
%{EXTRA_CMAKE_FLAGS}
%make_jobs
@@ -526,6 +533,7 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
%dir %{_includedir}/rdma
%{_includedir}/infiniband/*
%{_includedir}/rdma/*
+%{_libdir}/lib*.a
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/ibv_*
--
2.19.1
