mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-30 05:40:06 +00:00
- Update to 1.17
* Detect both g77-34 and gfortran
* Use a post-patch to set the CFLAGS and gfortran version correctly
* Mark gfortran as the default compiler (since g77 is deprecated in ports
tree), and enable g77-34 as a fallback
PR: ports/155906
Submitted by: Zhihao Yuan <lichray_AT_gmail_DOT_com>
This commit is contained in:
TAKATSU Tomonari
parent
179294411b
commit
0fae593bcc
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=273672
@ -6,8 +6,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= ExtUtils-F77
|
PORTNAME= ExtUtils-F77
|
||||||
PORTVERSION= 1.16
|
PORTVERSION= 1.17
|
||||||
PORTREVISION= 1
|
|
||||||
CATEGORIES= lang perl5
|
CATEGORIES= lang perl5
|
||||||
MASTER_SITES= CPAN
|
MASTER_SITES= CPAN
|
||||||
PKGNAMEPREFIX= p5-
|
PKGNAMEPREFIX= p5-
|
||||||
@ -19,11 +18,12 @@ PERL_CONFIGURE= yes
|
|||||||
|
|
||||||
MAN3= ExtUtils::F77.3
|
MAN3= ExtUtils::F77.3
|
||||||
|
|
||||||
F2CLIB= -lg2c
|
GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so//
|
||||||
|
F2CLIB= -lgfortran
|
||||||
|
|
||||||
post-patch:
|
post-patch:
|
||||||
@cd ${WRKSRC}; ${PERL5} -i.orig -pe \
|
@${REINPLACE_CMD} -e "s/'gfortran44'/'${FC}'/" \
|
||||||
's/(.*Freebsd.*lib )(-lf2c)(.*)/$$1 ${F2CLIB} $$3/' F77.pm
|
-e "s/'-O2'/'${CFLAGS}'/" \
|
||||||
@${REINPLACE_CMD} -e "s/'f77',/'f77','g77-34',/" ${WRKSRC}/F77.pm
|
${WRKSRC}/F77.pm
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|||||||
@ -1,3 +1,2 @@
|
|||||||
MD5 (ExtUtils-F77-1.16.tar.gz) = af925e7e8a2876a5fd9b6c4660e37664
|
SHA256 (ExtUtils-F77-1.17.tar.gz) = b3919200443174ff348ed5567d461335e289fba047cb17432f31dea5a26cad3f
|
||||||
SHA256 (ExtUtils-F77-1.16.tar.gz) = d3dfed878678495bbd1054d78ad100ddd3df59cbc8a2ce550dae9cd2e989b84c
|
SIZE (ExtUtils-F77-1.17.tar.gz) = 11225
|
||||||
SIZE (ExtUtils-F77-1.16.tar.gz) = 10234
|
|
||||||
|
|||||||
65
lang/p5-ExtUtils-F77/files/patch-F77.pm
Normal file
65
lang/p5-ExtUtils-F77/files/patch-F77.pm
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
--- F77.pm.orig 2010-12-31 19:53:06.000000000 -0600
|
||||||
|
+++ F77.pm 2011-03-24 01:05:00.742862139 -0500
|
||||||
|
@@ -351,9 +351,49 @@ $F77config{Aix}{DEFAULT} = 'F77';
|
||||||
|
|
||||||
|
### FreeBSD ###
|
||||||
|
|
||||||
|
-$F77config{Freebsd}{F77}{Trail_} = 1;
|
||||||
|
-$F77config{Freebsd}{F77}{Link} = '-L/usr/lib -lf2c -lm';
|
||||||
|
-$F77config{Freebsd}{DEFAULT} = 'F77';
|
||||||
|
+if($^O =~ /Freebsd/i) {
|
||||||
|
+ $gfortran = 'gfortran44'; # requires rewrite
|
||||||
|
+ $fallback_compiler = 'G77';
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+$F77config{Freebsd}{G77}{Link} = sub {
|
||||||
|
+ $dir = `g77-34 -print-file-name=libg2c.a`;
|
||||||
|
+ chomp $dir;
|
||||||
|
+ # Note that -print-file-name returns just the library name
|
||||||
|
+ # if it cant be found - make sure that we only accept the
|
||||||
|
+ # directory if it returns a proper path (or matches a /)
|
||||||
|
+
|
||||||
|
+ if( defined $dir ) {
|
||||||
|
+ $dir =~ s,/libg2c.a$,,;
|
||||||
|
+ } else {
|
||||||
|
+ $dir = "/usr/local/lib";
|
||||||
|
+ }
|
||||||
|
+ return( "-L$dir -L/usr/lib -lg2c -lm" );
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+$F77config{Freebsd}{GFortran}{Link} = sub {
|
||||||
|
+ $dir = `$gfortran -print-file-name=libgfortran.a`;
|
||||||
|
+ chomp $dir;
|
||||||
|
+ # Note that -print-file-name returns just the library name
|
||||||
|
+ # if it cant be found - make sure that we only accept the
|
||||||
|
+ # directory if it returns a proper path (or matches a /)
|
||||||
|
+
|
||||||
|
+ if( defined $dir ) {
|
||||||
|
+ $dir =~ s,/libgfortran.a$,,;
|
||||||
|
+ } else {
|
||||||
|
+ $dir = "/usr/local/lib";
|
||||||
|
+ }
|
||||||
|
+ return( "-L$dir -L/usr/lib -lgfortran -lm" );
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+$F77config{Freebsd}{G77}{Trail_} = 1;
|
||||||
|
+$F77config{Freebsd}{GFortran}{Trail_} = 1;
|
||||||
|
+$F77config{Freebsd}{G77}{Compiler} = 'g77-34';
|
||||||
|
+$F77config{Freebsd}{GFortran}{Compiler} = "$gfortran";
|
||||||
|
+$F77config{Freebsd}{G77}{Cflags} = '-O2';
|
||||||
|
+$F77config{Freebsd}{GFortran}{Cflags} = '-O2';
|
||||||
|
+$F77config{Freebsd}{DEFAULT} = 'GFortran';
|
||||||
|
+
|
||||||
|
|
||||||
|
### VMS ###
|
||||||
|
|
||||||
|
@@ -446,7 +486,8 @@ $Pkg: Will try system=Generic Compiler=$
|
||||||
|
EOD
|
||||||
|
$system =
|
||||||
|
$Config{cc} =~ /\bgcc/ && $^O =~ /MSWin32/i ? "MinGW"
|
||||||
|
- :"Generic";
|
||||||
|
+ : $^O =~ /Freebsd/i ? "Freebsd"
|
||||||
|
+ : "Generic";
|
||||||
|
$compiler = $fallback_compiler;
|
||||||
|
my $flibs = get ($F77config{$system}{$compiler}{Link});
|
||||||
|
$Runtime = $flibs ; #. gcclibs($flibs); # Note gcclibs appears to be no longer required.
|
||||||
@ -1,6 +1,5 @@
|
|||||||
%%SITE_PERL%%/ExtUtils/F77.pm
|
%%SITE_PERL%%/ExtUtils/F77.pm
|
||||||
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist
|
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist
|
||||||
%%SITE_PERL%%/ExtUtils/._F77.pm
|
|
||||||
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77
|
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77
|
||||||
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
|
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
|
||||||
@dirrmtry %%SITE_PERL%%/ExtUtils
|
@dirrmtry %%SITE_PERL%%/ExtUtils
|
||||||
|
|||||||
@ -6,8 +6,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= ExtUtils-F77
|
PORTNAME= ExtUtils-F77
|
||||||
PORTVERSION= 1.16
|
PORTVERSION= 1.17
|
||||||
PORTREVISION= 1
|
|
||||||
CATEGORIES= lang perl5
|
CATEGORIES= lang perl5
|
||||||
MASTER_SITES= CPAN
|
MASTER_SITES= CPAN
|
||||||
PKGNAMEPREFIX= p5-
|
PKGNAMEPREFIX= p5-
|
||||||
@ -19,11 +18,12 @@ PERL_CONFIGURE= yes
|
|||||||
|
|
||||||
MAN3= ExtUtils::F77.3
|
MAN3= ExtUtils::F77.3
|
||||||
|
|
||||||
F2CLIB= -lg2c
|
GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so//
|
||||||
|
F2CLIB= -lgfortran
|
||||||
|
|
||||||
post-patch:
|
post-patch:
|
||||||
@cd ${WRKSRC}; ${PERL5} -i.orig -pe \
|
@${REINPLACE_CMD} -e "s/'gfortran44'/'${FC}'/" \
|
||||||
's/(.*Freebsd.*lib )(-lf2c)(.*)/$$1 ${F2CLIB} $$3/' F77.pm
|
-e "s/'-O2'/'${CFLAGS}'/" \
|
||||||
@${REINPLACE_CMD} -e "s/'f77',/'f77','g77-34',/" ${WRKSRC}/F77.pm
|
${WRKSRC}/F77.pm
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|||||||
@ -1,3 +1,2 @@
|
|||||||
MD5 (ExtUtils-F77-1.16.tar.gz) = af925e7e8a2876a5fd9b6c4660e37664
|
SHA256 (ExtUtils-F77-1.17.tar.gz) = b3919200443174ff348ed5567d461335e289fba047cb17432f31dea5a26cad3f
|
||||||
SHA256 (ExtUtils-F77-1.16.tar.gz) = d3dfed878678495bbd1054d78ad100ddd3df59cbc8a2ce550dae9cd2e989b84c
|
SIZE (ExtUtils-F77-1.17.tar.gz) = 11225
|
||||||
SIZE (ExtUtils-F77-1.16.tar.gz) = 10234
|
|
||||||
|
|||||||
65
lang/p5-F77/files/patch-F77.pm
Normal file
65
lang/p5-F77/files/patch-F77.pm
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
--- F77.pm.orig 2010-12-31 19:53:06.000000000 -0600
|
||||||
|
+++ F77.pm 2011-03-24 01:05:00.742862139 -0500
|
||||||
|
@@ -351,9 +351,49 @@ $F77config{Aix}{DEFAULT} = 'F77';
|
||||||
|
|
||||||
|
### FreeBSD ###
|
||||||
|
|
||||||
|
-$F77config{Freebsd}{F77}{Trail_} = 1;
|
||||||
|
-$F77config{Freebsd}{F77}{Link} = '-L/usr/lib -lf2c -lm';
|
||||||
|
-$F77config{Freebsd}{DEFAULT} = 'F77';
|
||||||
|
+if($^O =~ /Freebsd/i) {
|
||||||
|
+ $gfortran = 'gfortran44'; # requires rewrite
|
||||||
|
+ $fallback_compiler = 'G77';
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+$F77config{Freebsd}{G77}{Link} = sub {
|
||||||
|
+ $dir = `g77-34 -print-file-name=libg2c.a`;
|
||||||
|
+ chomp $dir;
|
||||||
|
+ # Note that -print-file-name returns just the library name
|
||||||
|
+ # if it cant be found - make sure that we only accept the
|
||||||
|
+ # directory if it returns a proper path (or matches a /)
|
||||||
|
+
|
||||||
|
+ if( defined $dir ) {
|
||||||
|
+ $dir =~ s,/libg2c.a$,,;
|
||||||
|
+ } else {
|
||||||
|
+ $dir = "/usr/local/lib";
|
||||||
|
+ }
|
||||||
|
+ return( "-L$dir -L/usr/lib -lg2c -lm" );
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+$F77config{Freebsd}{GFortran}{Link} = sub {
|
||||||
|
+ $dir = `$gfortran -print-file-name=libgfortran.a`;
|
||||||
|
+ chomp $dir;
|
||||||
|
+ # Note that -print-file-name returns just the library name
|
||||||
|
+ # if it cant be found - make sure that we only accept the
|
||||||
|
+ # directory if it returns a proper path (or matches a /)
|
||||||
|
+
|
||||||
|
+ if( defined $dir ) {
|
||||||
|
+ $dir =~ s,/libgfortran.a$,,;
|
||||||
|
+ } else {
|
||||||
|
+ $dir = "/usr/local/lib";
|
||||||
|
+ }
|
||||||
|
+ return( "-L$dir -L/usr/lib -lgfortran -lm" );
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+$F77config{Freebsd}{G77}{Trail_} = 1;
|
||||||
|
+$F77config{Freebsd}{GFortran}{Trail_} = 1;
|
||||||
|
+$F77config{Freebsd}{G77}{Compiler} = 'g77-34';
|
||||||
|
+$F77config{Freebsd}{GFortran}{Compiler} = "$gfortran";
|
||||||
|
+$F77config{Freebsd}{G77}{Cflags} = '-O2';
|
||||||
|
+$F77config{Freebsd}{GFortran}{Cflags} = '-O2';
|
||||||
|
+$F77config{Freebsd}{DEFAULT} = 'GFortran';
|
||||||
|
+
|
||||||
|
|
||||||
|
### VMS ###
|
||||||
|
|
||||||
|
@@ -446,7 +486,8 @@ $Pkg: Will try system=Generic Compiler=$
|
||||||
|
EOD
|
||||||
|
$system =
|
||||||
|
$Config{cc} =~ /\bgcc/ && $^O =~ /MSWin32/i ? "MinGW"
|
||||||
|
- :"Generic";
|
||||||
|
+ : $^O =~ /Freebsd/i ? "Freebsd"
|
||||||
|
+ : "Generic";
|
||||||
|
$compiler = $fallback_compiler;
|
||||||
|
my $flibs = get ($F77config{$system}{$compiler}{Link});
|
||||||
|
$Runtime = $flibs ; #. gcclibs($flibs); # Note gcclibs appears to be no longer required.
|
||||||
@ -1,6 +1,5 @@
|
|||||||
%%SITE_PERL%%/ExtUtils/F77.pm
|
%%SITE_PERL%%/ExtUtils/F77.pm
|
||||||
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist
|
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist
|
||||||
%%SITE_PERL%%/ExtUtils/._F77.pm
|
|
||||||
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77
|
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77
|
||||||
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
|
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
|
||||||
@dirrmtry %%SITE_PERL%%/ExtUtils
|
@dirrmtry %%SITE_PERL%%/ExtUtils
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user