svn commit: r1372051 - /spamassassin/trunk/t/make_install.t

[km...@apache.org]

Author: kmcgrail
Date: Sun Aug 12 06:48:47 2012
New Revision: 1372051

URL: http://svn.apache.org/viewvc?rev=1372051&view=rev
Log:
more logic for rpm-based perl and lib64 issues - bug 6809

Modified:
    spamassassin/trunk/t/make_install.t

Modified: spamassassin/trunk/t/make_install.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/make_install.t?rev=1372051&r1=1372050&r2=1372051&view=diff
==============================================================================
--- spamassassin/trunk/t/make_install.t (original)
+++ spamassassin/trunk/t/make_install.t Sun Aug 12 06:48:47 2012
@@ -34,14 +34,25 @@ system_or_die "cd $builddir && mv Mail-S
 #Fix for RH/Fedora using lib64 instead of lib - bug 6609
 $x64_bit_lib_test = 0;
 if (-e '/bin/rpm') {
-  $command = '/bin/rpm --showrc';
-
-  @output = `$command`;
-
-  foreach $output (@output) {
-    if ($output =~ /-\d+: _lib(dir)?\t(.*)$/) {
-      if ($2 && $2 =~ /64/) {
-        $x64_bit_lib_test++;
+  #More logic added from bug 6809
+  #Are we running an RPM version of Perl?
+  $command = "/bin/rpm -qf $^X";
+ 
+  $output = `$command`;
+  if ($output =~ /not owned by any package/i) {
+    #WE AREN'T RUNNING AN RPM VERSION OF PERL SO WILL ASSUME NO LIB64 DIR
+    #is there a test we can run for this?
+  } else {
+
+    $command = '/bin/rpm --showrc';
+
+    @output = `$command`;
+
+    foreach $output (@output) {
+      if ($output =~ /-\d+: _lib(dir)?\t(.*)$/) {
+        if ($2 && $2 =~ /64/) {
+          $x64_bit_lib_test++;
+        }
       }
     }
   }
@@ -78,6 +89,7 @@ run_makefile_pl "PREFIX=$instdir/foo";
 
 ok -d "$instdir/foo/bin";
 if ($x64_bit_lib_test) {
+  #print "testing for $instdir/foo/lib64";
   ok -d "$instdir/foo/lib64";
 } else {
   ok -d "$instdir/foo/lib";