[Reproducible-commits] [perl] 03/36: lib/perl5db.pl: Restore noop lock prototype

Mattia Rizzolo mattia at mapreri.org
Tue Nov 17 14:00:55 UTC 2015


This is an automated email from the git hooks/post-receive script.

mapreri-guest pushed a commit to branch pu/reproducible_builds
in repository perl.

commit 4b85a05db9c1c608f103a8bae2ba59dc1ca89419
Author: James McCoy <vega.james at gmail.com>
Date:   Thu Mar 19 22:55:18 2015 -0400

    lib/perl5db.pl: Restore noop lock prototype
    
    cde405a6b9b86bd8110f63531b42d89590a4c56e removed the lock prototype
    "because it's already a do-nothing weak keyword without threads".
    However, that causes "perl -d threaded-script.pl" to complain
    
        lock can only be used on shared values at /usr/share/perl/5.20/perl5db.pl line 4101.
        BEGIN failed--compilation aborted at threaded-script.pl line 2.
        lock can only be used on shared values at /usr/share/perl/5.20/perl5db.pl line 2514.
        END failed--call queue aborted at threaded-script.pl line 2.
        Unbalanced scopes: 3 more ENTERs than LEAVEs
    
    because threaded-script.pl's importing of threads::shared enable's
    lock()'s non-noop behavior.  Restoring the lock() prototype fixes the
    inconsistency between lock() and share() usage.
    
    Signed-off-by: James McCoy <vega.james at gmail.com>
    
    Origin: upstream, http://perl5.git.perl.org/perl.git/commit/41ef2c66e0da6dfb04ded81b979f7081007a1add
    Bug: https://rt.perl.org/Public/Bug/Display.html?id=124127
    Bug-Debian: https://bugs.debian.org/779357
    Patch-Name: fixes/perldb-threads.diff
---
 lib/perl5db.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/perl5db.pl b/lib/perl5db.pl
index 6ac4d36..f962fb8 100644
--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
@@ -866,6 +866,7 @@ BEGIN {
         lock($DBGR);
         print "Threads support enabled\n";
     } else {
+        *lock = sub(*) {};
         *share = sub(\[$@%]) {};
     }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/perl.git



More information about the Reproducible-commits mailing list