From 46b3ee6eab70c1f4d688ee91dbb962456e1b5962 Mon Sep 17 00:00:00 2001 From: Ed J Date: Sun, 8 Dec 2019 15:51:30 +0000 Subject: [PATCH] PGPLOT stop accidentally finding own PGPLOT.pm from . in @INC - was loading installed %PDL::Config --- Changes | 2 ++ Graphics/PGPLOT/Makefile.PL | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index a1bddf887..9d296d46f 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +- PGPLOT stop accidentally finding own PGPLOT.pm from . in @INC - was loading installed %PDL::Config + 2.019_05 2019-12-02 - calloc->malloc+memset, as calloc on Win32 = "free to wrong pool" - memset after malloc in pdlapi.c diff --git a/Graphics/PGPLOT/Makefile.PL b/Graphics/PGPLOT/Makefile.PL index 86dbe0e1f..17599baef 100644 --- a/Graphics/PGPLOT/Makefile.PL +++ b/Graphics/PGPLOT/Makefile.PL @@ -2,7 +2,10 @@ use strict; use warnings; use ExtUtils::MakeMaker; -eval { require PGPLOT }; +eval { + local @INC = grep $_ ne '.', @INC; + require PGPLOT; +}; if ($@) { write_dummy_make("Not building PDL::Graphics::PGPLOT, PGPLOT not installed"); return;