MPI: remove need for external package

EinsteinToolkit · Jul 15, 2019 · 2995447 · 2995447
1 parent 6e1074b
commit 2995447
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/src/build.pl b/src/build.pl
@@ -11,16 +11,13 @@
 
 if ($verbose) {
     # we implement VERBOSE by restarting in the debugger and having it print each line
-    unless (defined &DB::DB) {
-        # sadly Devel::Trace is not a standard package so we test for it here
-        eval {
-            require Devel::Trace;
-        };
-        unless ($@) {
-            exit system($^X, "-d:Trace", $0,  @ARGV);
-        } else {
-            message("Could not 'import Devel::Trace' required for VERBOSE=yes. Consider installing it from CPAN https://metacpan.org/pod/Devel::Trace or using your package manager (possibly in the libdevel-trace-perl package).");
-        }
+    if (not defined($ENV{'PERL5DB'})) {
+        $ENV{'PERL5DB'} = 'sub DB::DB {
+            my ($p, $f, $l) = caller;
+            my $code = \@{"::_<$f"};
+            print STDERR ">> $f:$l: $code->[$l]";
+          }';
+        exit system($^X, "-d", $0, @ARGV);
     }
 }
 

diff --git a/src/detect.pl b/src/detect.pl
@@ -15,16 +15,13 @@
 
 if ($verbose) {
     # we implement VERBOSE by restarting in the debugger and having it print each line
-    unless (defined &DB::DB) {
-        # sadly Devel::Trace is not a standard package so we test for it here
-        eval {
-            require Devel::Trace;
-        };
-        unless ($@) {
-            exit system($^X, "-d:Trace", $0,  @ARGV);
-        } else {
-            message("Could not 'import Devel::Trace' required for VERBOSE=yes. Consider installing it from CPAN https://metacpan.org/pod/Devel::Trace or using your package manager (possibly in the libdevel-trace-perl package).");
-        }
+    if (not defined($ENV{'PERL5DB'})) {
+        $ENV{'PERL5DB'} = 'sub DB::DB {
+            my ($p, $f, $l) = caller;
+            my $code = \@{"::_<$f"};
+            print STDERR ">> $f:$l: $code->[$l]";
+          }';
+        exit system($^X, "-d", $0, @ARGV);
     }
 }