packages: perl-ExtUtils-F77/perl-ExtUtils-F77-gcc.patch, perl-ExtUtils-F77/...
qboosh
qboosh at pld-linux.org
Sat Dec 17 20:10:43 CET 2011
Author: qboosh Date: Sat Dec 17 19:10:43 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.17
- updated gcc patch, merged with lib64 patch
- updated Fortran compiler BR (gcc-fortran now)
---- Files affected:
packages/perl-ExtUtils-F77:
perl-ExtUtils-F77-gcc.patch (1.3 -> 1.4) , perl-ExtUtils-F77.spec (1.43 -> 1.44) , perl-ExtUtils-F77-lib64.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/perl-ExtUtils-F77/perl-ExtUtils-F77-gcc.patch
diff -u packages/perl-ExtUtils-F77/perl-ExtUtils-F77-gcc.patch:1.3 packages/perl-ExtUtils-F77/perl-ExtUtils-F77-gcc.patch:1.4
--- packages/perl-ExtUtils-F77/perl-ExtUtils-F77-gcc.patch:1.3 Fri Mar 28 11:15:28 2008
+++ packages/perl-ExtUtils-F77/perl-ExtUtils-F77-gcc.patch Sat Dec 17 20:10:38 2011
@@ -1,38 +1,50 @@
---- ExtUtils-F77-1.16/F77.pm.orig 2007-04-02 06:40:23.000000000 +0200
-+++ ExtUtils-F77-1.16/F77.pm 2008-03-28 10:20:31.965651075 +0100
-@@ -173,19 +173,23 @@
- my @libs = ('g2c', 'f2c');
- my ($dir, $lib, $test);
- foreach $test (@libs) {
-- $dir = `g77 -print-file-name=lib$test.a`;
-+ foreach $ext ('.so', '.a') {
-+ $dir = `g77 -print-file-name=lib$test$ext`;
- 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 ne "lib$test.a") {
-+ if (defined $dir && $dir ne "lib$test$ext") {
- $lib = $test; # Found an existing library
- last;
- }
-+ }
-+ last if (defined $lib);
- }
-
- if( defined $dir && defined $lib) {
-- $dir =~ s,/lib$lib.a$,,;
-+ $dir =~ s,/lib$lib\..*$,,;
-+ $dir = `cd $dir ; pwd`; # sanitize
- } else {
- $dir = "/usr/local/lib";
- $lib = "f2c";
-@@ -194,7 +199,7 @@
- };
- $F77config{Generic}{G77}{Trail_} = 1;
- $F77config{Generic}{G77}{Compiler} = find_in_path('g77','f77','fort77');
--$F77config{Generic}{G77}{Cflags} = '-O';
-+$F77config{Generic}{G77}{Cflags} = "$Config{'optimize'}";
- $F77config{Generic}{DEFAULT} = 'G77';
- $F77config{Generic}{F2c} = $F77config{Generic}{G77};
-
+--- ExtUtils-F77-1.17/F77.pm.orig 2011-01-01 02:53:06.000000000 +0100
++++ ExtUtils-F77-1.17/F77.pm 2011-12-17 13:56:13.302842603 +0100
+@@ -255,7 +255,7 @@
+ ### Generic GNU-77 or F2C system ###
+
+ $F77config{Generic}{GNU}{Trail_} = 1;
+-$F77config{Generic}{GNU}{Cflags} = ' '; # <---need this space!
++$F77config{Generic}{GNU}{Cflags} = "$Config{'optimize'}";
+ $F77config{Generic}{GNU}{Link} = link_gnufortran_compiler('g77', 'gfortran', 'g95', 'fort77');
+ $F77config{Generic}{GNU}{Compiler} = find_in_path('g77', "$gfortran", 'g95','fort77');
+ $F77config{Generic}{DEFAULT} = 'GNU';
+@@ -587,7 +587,7 @@
+ # Create list of directories to search (with common defaults)
+
+ my @path = ();
+- for (@args, "/usr/lib", "/lib") {
++ for (@args, "/usr/lib64", "/lib64", "/usr/lib", "/lib") {
+ push @path, $1 if /^-L(.+)$/ && -d $1;
+ }
+
+@@ -717,21 +717,25 @@
+ my @libs = @{$complibs{$compiler}};
+ my ($dir, $lib, $test);
+ foreach $test (@libs) {
+- $dir = `$compiler -print-file-name=lib$test.a`;
++ foreach $ext ('.so', '.a') {
++ $dir = `$compiler -print-file-name=lib$test$ext`;
+ 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 ne "lib$test.a") {
++ if (defined $dir && $dir ne "lib$test$ext") {
+ $lib = $test; # Found an existing library
+- $dir =~ s,/lib$lib.a$,,;
++ $dir =~ s,/lib$lib$ext$,,;
++ $dir = `cd $dir ; pwd | tr -d '\n'`; # sanitize
+ last;
+ } else {
+ $dir = "/usr/local/lib";
+ $lib = "f2c";
+ }
+ }
+- return( "-L$dir -L/usr/lib -l$lib -lm" );
++ last if defined($lib);
++ }
++ return( "-L$dir -l$lib -lm" );
+ }
+
+
================================================================
Index: packages/perl-ExtUtils-F77/perl-ExtUtils-F77.spec
diff -u packages/perl-ExtUtils-F77/perl-ExtUtils-F77.spec:1.43 packages/perl-ExtUtils-F77/perl-ExtUtils-F77.spec:1.44
--- packages/perl-ExtUtils-F77/perl-ExtUtils-F77.spec:1.43 Sun May 11 13:59:56 2008
+++ packages/perl-ExtUtils-F77/perl-ExtUtils-F77.spec Sat Dec 17 20:10:38 2011
@@ -9,20 +9,19 @@
Summary: ExtUtils::F77 Perl module - simple interface to F77 libraries
Summary(pl.UTF-8): Moduł Perla ExtUtils::F77 - prosty interfejs do bibliotek F77
Name: perl-ExtUtils-F77
-Version: 1.16
-Release: 2
+Version: 1.17
+Release: 1
# same as perl
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
Source0: http://www.cpan.org/modules/by-module/ExtUtils/%{pdir}-%{pnam}-%{version}.tar.gz
-# Source0-md5: af925e7e8a2876a5fd9b6c4660e37664
+# Source0-md5: c0143b5342587ed2ee5db3f6cfb9cc13
Patch0: %{name}-gcc.patch
-Patch1: %{name}-lib64.patch
URL: http://search.cpan.org/dist/ExtUtils-F77/
-BuildRequires: gcc-g77
+BuildRequires: gcc-fortran
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
-Requires: gcc-g77
+Requires: gcc-fortran
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,7 +41,6 @@
%prep
%setup -q -n %{pdir}-%{pnam}-%{version}
%patch0 -p1
-%patch1 -p1
%build
%{__perl} Makefile.PL \
@@ -64,7 +62,7 @@
%defattr(644,root,root,755)
%doc CHANGES
%{perl_vendorlib}/ExtUtils/F77.pm
-%{_mandir}/man3/*
+%{_mandir}/man3/ExtUtils::F77.3pm*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -72,6 +70,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.44 2011/12/17 19:10:38 qboosh
+- updated to 1.17
+- updated gcc patch, merged with lib64 patch
+- updated Fortran compiler BR (gcc-fortran now)
+
Revision 1.43 2008/05/11 11:59:56 hawk
- fixed x86_64 build, release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-ExtUtils-F77/perl-ExtUtils-F77-gcc.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-ExtUtils-F77/perl-ExtUtils-F77.spec?r1=1.43&r2=1.44&f=u
More information about the pld-cvs-commit
mailing list