From 94801aa2ff0963039a7709524c993b579d3e771b Mon Sep 17 00:00:00 2001 From: Yossi Etigin Date: Thu, 23 Apr 2009 22:51:33 +0300 Subject: [PATCH] Installer: fix build of rnfs-utils on ia64 and i386 Make rnfs-utils on ia64 and i386 look for libblkid.so in /usr/lib instead of /usr/lib64. Also use some variables and make the script shorter. Signed-off-by: Yosef Etigin --- install.pl | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/install.pl b/install.pl index 3bb7b33..d2634e6 100755 --- a/install.pl +++ b/install.pl @@ -2652,19 +2652,14 @@ sub check_linux_dependencies $err++; } } - if ($arch =~ m/powerpc|ppc64/ and not -e "/usr/lib/libblkid.so") { - if ($kernel =~ m/2.6.2[6-7]/ and $distro eq "SuSE") { - print RED "libblkid-devel-32bit is required to build rnfs-utils.", RESET "\n"; - } else { - print RED "e2fsprogs-devel-32bit is required to build rnfs-utils.", RESET "\n"; - } - $err++; - } elsif (not -e "/usr/lib64/libblkid.so") { - if ($kernel =~ m/2.6.2[6-7]/ and $distro eq "SuSE") { - print RED "libblkid-devel is required to build rnfs-utils.", RESET "\n"; - } else { - print RED "e2fsprogs-devel is required to build rnfs-utils.", RESET "\n"; - } + + my $blkid_so = ($arch =~ m/x86_64/) ? "/usr/lib64/libblkid.so" : "/usr/lib/libblkid.so"; + my $blkid_pkg = ($kernel =~ m/2.6.2[6-7]/ and $distro eq "SuSE") ? "libblkid-devel" : + "e2fsprogs-devel"; + $blkid_pkg .= ($arch =~ m/powerpc|ppc64/) ? "-32bit" : ""; + + if (not -e $blkid_so) { + print RED "$blkid_pkg is required to build rnfs-utils.", RESET "\n"; $err++; } } -- 2.46.0