[gentoo-commits] gentoo-x86 commit in dev-perl/Devel-Profiler/files: perl510.patch

[Torsten Veller (tove)]

tove        10/01/07 07:54:28

  Added:                perl510.patch
  Log:
  Fix test failure (#299981). Patch from Fedora
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-perl/Devel-Profiler/files/perl510.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/Devel-Profiler/files/perl510.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-perl/Devel-Profiler/files/perl510.patch?rev=1.1&content-type=text/plain

Index: perl510.patch
===================================================================
http://cvs.fedoraproject.org/viewvc/devel/perl-Devel-Profiler/perl-Devel-Profiler-perl510.patch
--- Devel-Profiler-0.04/lib/Devel/Profiler.pm
+++ Devel-Profiler-0.04/lib/Devel/Profiler.pm
@@ -151,9 +151,14 @@ sub scan {
             }
             
             # found a code ref?  then instrument it
-            instrument($pkg, $sym, $code) 
-              if defined($code = *{$glob}{CODE}) and ref $code eq 'CODE';
-              
+            if (ref \$glob ne 'GLOB') {
+                # Something stranger in the typeglob, which will expand to (at
+                # least) a prototype if we take a reference to it.
+                instrument($pkg, $sym, \&{"$pkg$sym"});
+            } else {
+                instrument($pkg, $sym, $code) 
+                    if defined($code = *{$glob}{CODE}) and ref $code eq 'CODE';
+            }            
         }
     }
 }
--- Devel-Profiler-0.04/t/09fcntl.t
+++ Devel-Profiler-0.04/t/09fcntl.t
@@ -8,7 +8,14 @@ foo();
 END
 
 # make sure the call tree looks right
-check_tree(<<END, "checking tree");
+if ($] > 5.009) {
+    # Fcntl's constants are now directly defined, so constant() isn't called.
+    check_tree(<<END, "checking tree");
+main::foo
+END
+} else {
+    check_tree(<<END, "checking tree");
 main::foo
    Fcntl::constant
 END
+}