From 0a4127eda1ea89287d6dc84113a5ab3707fb262e Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Fri, 27 Mar 2009 14:52:27 -0500 Subject: [PATCH] ofed_1_4_scripts: Fix ppc64 building of rnfs-utils rnfs-utils will not build on ppc64 without a 32bit version of e2fsprogs-devel. The 32bit version is needed due to logic previously added to install.pl to force the compile to be 32bit. Another way to fix this issue would be to allow 64bit version of the rnfs-utils by removing the logic which forces it to be 32bit. With the added dependency, rnfs-utils compiles on RHEL5.2 on ppc64 without issue. Signed-Off-By: Jon Mason --- install.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/install.pl b/install.pl index 909c989..99de9d3 100755 --- a/install.pl +++ b/install.pl @@ -256,14 +256,17 @@ sub usage my $sysfsutils; my $sysfsutils_devel; +my $e2fsprogs_devel; if ($distro eq "SuSE" or $distro eq "redhat" or $distro eq "fedora" or $distro eq "Rocks") { $sysfsutils = "sysfsutils"; $sysfsutils_devel = "sysfsutils-devel"; + $e2fsprogs_devel = "e2fsprogs-devel"; } else { $sysfsutils = "libsysfs"; $sysfsutils_devel = "libsysfs-devel"; + $e2fsprogs_devel = "libe2fsprogs-devel"; } my $network_dir; @@ -2635,6 +2638,12 @@ sub check_linux_dependencies } } } + if ($arch eq "ppc64" and $package eq "rnfs-utils") { + if (not -e "/usr/lib/libblkid.so") { + print RED "$e2fsprogs_devel 32bit is required to build rnfs-utils.", RESET "\n"; + $err++; + } + } } # Check installation requirements -- 2.41.0