Skip to content

Commit

Permalink
Handle @inc without . in it for PDL build - Take 2
Browse files Browse the repository at this point in the history
  • Loading branch information
salva committed Mar 30, 2017
1 parent d8df2ed commit 94777a0
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Basic/Core/Core.xs
Expand Up @@ -336,7 +336,7 @@ iscontig(x)

# using "perl" not $^X because that doesn't work on "perl in space"
# TODO: switching back to $^X since using "perl" is not a viable fix
INCLUDE_COMMAND: $^X -e "require q{Dev.pm}; PDL::Core::Dev::generate_core_flags()"
INCLUDE_COMMAND: $^X -e "require q{./Dev.pm}; PDL::Core::Dev::generate_core_flags()"

#if 0
=begin windows_mmap
Expand Down
2 changes: 1 addition & 1 deletion Basic/Core/pdl.h.PL
Expand Up @@ -6,7 +6,7 @@ use Config;
use File::Basename qw(&basename &dirname);

# how many variable types (ie PDL_Byte, ...) are there?
require 'Types.pm';
require './Types.pm';
my $ntypes = $#PDL::Types::names;
my $PDL_DATATYPES = PDL::Types::datatypes_header();

Expand Down
4 changes: 2 additions & 2 deletions Basic/Core/pdlconv.c.PL
Expand Up @@ -7,9 +7,9 @@ use strict;
use Config;
use File::Basename qw(&basename &dirname);

require 'Dev.pm'; PDL::Core::Dev->import;
require './Dev.pm'; PDL::Core::Dev->import;
use vars qw( %PDL_DATATYPES );
require 'Types.pm'; #for typesrtkeys
require './Types.pm'; #for typesrtkeys

# This forces PL files to create target in same directory as PL file.
# This is so that make depend always knows where to find PL derivatives.
Expand Down
4 changes: 2 additions & 2 deletions Basic/Core/pdlcore.c.PL
Expand Up @@ -6,15 +6,15 @@ use strict;
use Config;
use File::Basename qw(&basename &dirname);

require 'Dev.pm'; PDL::Core::Dev->import;
require './Dev.pm'; PDL::Core::Dev->import;
use vars qw( %PDL_DATATYPES );

# check for bad value support
require './Config.pm'; # to load the PDL not the Perl one
die "No PDL::Config found" unless %PDL::Config;
my $bvalflag = $PDL::Config{WITH_BADVAL};
my $usenan = $PDL::Config{BADVAL_USENAN};
require 'Types.pm';
require './Types.pm';
PDL::Types->import(':All');


Expand Down
4 changes: 2 additions & 2 deletions Basic/Core/pdlcore.h.PL
Expand Up @@ -11,7 +11,7 @@ use strict;
use Config;
use File::Basename qw(&basename &dirname);

require 'Dev.pm'; PDL::Core::Dev->import;
require './Dev.pm'; PDL::Core::Dev->import;
use vars qw( %PDL_DATATYPES );

# version 2 is for versions after PDL 2.1.1
Expand Down Expand Up @@ -349,7 +349,7 @@ double NaN_double;

# fortunately it looks like Types.pm.PL is processed before this
# file
require "Types.pm"; # ie PDL::Types
require "./Types.pm"; # ie PDL::Types

for (PDL::Types::typesrtkeys()) {
my $ctype = $PDL::Types::typehash{$_}{ctype};
Expand Down
2 changes: 1 addition & 1 deletion Basic/Core/pdlsimple.h.PL
Expand Up @@ -3,7 +3,7 @@
use Config;
use File::Basename qw(&basename &dirname);

require 'Types.pm';
require './Types.pm';
my $PDL_DATATYPES = PDL::Types::datatypes_header();

# List explicitly here the variables you want Configure to
Expand Down

0 comments on commit 94777a0

Please sign in to comment.