1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
Description: Patch HDF modules with hardcoded paths not use Alien::HDF4
Author: Ed J <mohawk2@users.noreply.github.com>
Forwarded: not-needed
---
Makefile.PL | 35 -----------------------------------
SD/Makefile.PL | 3 ++-
VS/Makefile.PL | 3 ++-
3 files changed, 4 insertions(+), 37 deletions(-)
--- a/SD/Makefile.PL
+++ b/SD/Makefile.PL
@@ -4,8 +4,9 @@ use ExtUtils::MakeMaker;
use Config;
my $package = [ qw(SD.pd SD PDL::IO::HDF::SD) ];
-my $pkg = ExtUtils::Depends->new(qw(PDL::IO::HDF::SD Alien::HDF4));
-$pkg->set_inc(&PDL_INCLUDE());
+my $pkg = ExtUtils::Depends->new(qw(PDL::IO::HDF::SD));
+$pkg->set_inc('-I/usr/include/hdf ' . &PDL_INCLUDE());
+$pkg->set_libs('-lmfhdf -ldf -ljpeg -lz');
$pkg->add_typemaps(&PDL_TYPEMAP());
$pkg->add_pm(
'SD.pm' => '$(INST_LIBDIR)/SD.pm',
--- a/VS/Makefile.PL
+++ b/VS/Makefile.PL
@@ -8,8 +8,9 @@ my $package = [ qw(VS.pd VS PDL::IO::HDF
undef &MY::postamble; # suppress warning
*MY::postamble = sub { pdlpp_postamble($package); };
-my $pkg = ExtUtils::Depends->new(qw(PDL::IO::HDF::VS Alien::HDF4));
-$pkg->set_inc(&PDL_INCLUDE());
+my $pkg = ExtUtils::Depends->new(qw(PDL::IO::HDF::VS));
+$pkg->set_inc('-I/usr/include/hdf ' . &PDL_INCLUDE());
+$pkg->set_libs('-lmfhdf -ldf -ljpeg -lz');
$pkg->add_typemaps(&PDL_TYPEMAP());
$pkg->add_pm(
'VS.pm' => '$(INST_LIBDIR)/VS.pm',
|