From: Vladimir Sokolovsky Date: Fri, 6 Sep 2019 19:57:05 +0000 (-0500) Subject: install.pl: Added rdma-core requirements X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1d20452c16c2e85fe2cc73991fe900b8543a7d4c;p=~vlad%2Fofed_scripts.git install.pl: Added rdma-core requirements Signed-off-by: Vladimir Sokolovsky --- diff --git a/install.pl b/install.pl index f75ada5..1df924e 100755 --- a/install.pl +++ b/install.pl @@ -373,6 +373,7 @@ my $openssl = 'openssl'; my $libcurl = 'libcurl'; my $cmake = 'cmake'; my $ninja = ''; +my $pandoc = ''; if ($DISTRO =~ m/SLES11/) { $libstdc = 'libstdc++43'; $libgcc = 'libgcc43'; @@ -413,6 +414,7 @@ if ($DISTRO =~ m/SLES11/) { $libstdc = 'libstdc++'; $libgcc = 'libgcc'; $libgfortran = 'gcc-gfortran'; + $pandoc = "pandoc"; if ($DISTRO =~ m/RHEL6|OEL6|FC/) { $curl_devel = 'libcurl-devel'; } elsif ($DISTRO =~ m/RHEL[78]/) { @@ -442,7 +444,7 @@ my $python = "python"; if ($DISTRO =~ m/RHEL8/) { $python = "python36"; $python_devel = "python36-devel"; - $python_cython = "python2-Cython"; + $python_cython = "python3-Cython"; $pkgconfig = "pkgconf-pkg-config"; $libnl_devel = 'libnl3-devel'; $libnl = 'libnl3'; @@ -796,7 +798,7 @@ my %packages_info = ( dist_req_build => [ "cmake__2.8.11", "$libudev_devel", "$pkgconfig", "$valgrind_devel", "$gcc", "$glibc_devel$suffix_64bit", - "$libgcc", "$python_devel", "$python_cython", + "$libgcc", "$python_devel", "$python_cython", "$pandoc", "$libnl3_devel"."$suffix_64bit", ($build32 == 1) ? ( "$glibc_devel$suffix_32bit", @@ -2561,6 +2563,13 @@ sub build_rpm $cmd .= " --define '_defaultdocdir $def_doc_dir/$main_packages{$parent}{'name'}-$main_packages{$parent}{'version'}'"; $cmd .= " --define '_usr $prefix'"; } + elsif ($parent eq 'rdma-core') { + if ($DISTRO =~ /RHEL8 | FC2[6-9]/x) { + # Due to rdma-core dependencies it requires with_pyverbs to be + # enabled on RHEL8 + $cmd .= " --define '_with_pyverbs 1'"; + } + } else { $cmd .= " --define '_prefix $prefix'"; $cmd .= " --define '_exec_prefix $prefix'";