From ff22ac9b2bf44d3163dd92ff1819f11a9fbc2e0c Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Sun, 16 Jul 2023 21:58:02 +0800 Subject: [PATCH] Fix build on FreeBSD by allowing "amd64" It also unifies the pattern in various places. --- Libtmp/Minuit/Makefile.PL | 2 +- Libtmp/Slatec/Makefile.PL | 2 +- Makefile.PL | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Libtmp/Minuit/Makefile.PL b/Libtmp/Minuit/Makefile.PL index eddf62434..cefd8af02 100644 --- a/Libtmp/Minuit/Makefile.PL +++ b/Libtmp/Minuit/Makefile.PL @@ -120,7 +120,7 @@ undef &MY::postamble; # suppress warning my $mycompiler = $f77->compiler(); my $mycflags = $f77->cflags(); my $orig = pdlpp_postamble_int(@pack); - my $hack_64bit = ($Config{archname}=~m/x86_64|i686/ ?" -fPIC " : ""); + my $hack_64bit = ($Config{archname}=~m/amd64|i686|x86_64/ ?" -fPIC " : ""); $orig =~ s/:\s*minuit\.pd/: minuit.pd/; $orig .= "FFLAGS = $hack_64bit $mycflags \$(OPTIMIZE)\n"; $orig .= join "\n",map { diff --git a/Libtmp/Slatec/Makefile.PL b/Libtmp/Slatec/Makefile.PL index 142840b05..443d53b12 100644 --- a/Libtmp/Slatec/Makefile.PL +++ b/Libtmp/Slatec/Makefile.PL @@ -81,7 +81,7 @@ undef &MY::postamble; # suppress warning my $mycompiler = $f77->compiler(); my $mycflags = $f77->cflags(); my $orig = pdlpp_postamble_int(@pack); - my $hack_64bit = $Config{archname}=~m/x86_64|i686/ ?" -fPIC " : ""; + my $hack_64bit = $Config{archname}=~m/amd64|i686|x86_64/ ?" -fPIC " : ""; $orig =~ s/:\s*slatec\.pd/: slatec.pd/; $orig .= "FFLAGS = $hack_64bit $mycflags \$(OPTIMIZE)\n"; join "\n", $orig, map "$_\$(OBJ_EXT): $_.f diff --git a/Makefile.PL b/Makefile.PL index a3ec1ab2f..cdabf4301 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -160,7 +160,7 @@ my @cleanup = ("pdl$Config{exe_ext}", qw( # use similar mods to affect CCFLAGS on other systems as needed... my $ccflags = $Config{ccflags}; -if($Config{archname}=~m/x86_64/) { +if($Config{archname}=~m/amd64|i686|x86_64/) { $ccflags .= " -fPIC"; }