From c7f0603905e174ab3d1352d1e8535b8eafd001bd Mon Sep 17 00:00:00 2001
From: Tony Cook <tony@develop-help.com>
Date: Thu, 25 Dec 2014 16:38:00 +1100
Subject: [PATCH] Devel::CheckLib: handle the gcc-4 symlink on Cygwin

---
 Changes                    |  3 +++
 FT2/Changes                |  6 ++++++
 FT2/FT2.pm                 |  2 +-
 FT2/inc/Devel/CheckLib.pm  | 10 +++++++---
 GIF/Changes                |  3 +++
 GIF/inc/Devel/CheckLib.pm  | 10 +++++++---
 JPEG/Changes               |  8 ++++++++
 JPEG/JPEG.pm               |  2 +-
 JPEG/inc/Devel/CheckLib.pm | 10 +++++++---
 PNG/Changes                |  6 ++++++
 PNG/PNG.pm                 |  2 +-
 PNG/inc/Devel/CheckLib.pm  | 10 +++++++---
 T1/Changes                 |  6 ++++++
 T1/T1.pm                   |  2 +-
 T1/inc/Devel/CheckLib.pm   | 10 +++++++---
 TIFF/Changes               |  6 ++++++
 TIFF/TIFF.pm               |  2 +-
 TIFF/inc/Devel/CheckLib.pm | 10 +++++++---
 W32/Changes                |  6 ++++++
 W32/W32.pm                 |  2 +-
 W32/inc/Devel/CheckLib.pm  | 10 +++++++---
 inc/Devel/CheckLib.pm      | 10 +++++++---
 22 files changed, 106 insertions(+), 30 deletions(-)

diff --git a/Changes b/Changes
index 5c5ce612..9bd12ae9 100644
--- a/Changes
+++ b/Changes
@@ -22,6 +22,9 @@ Imager release history.  Older releases can be found in Changes.old
  - The --enable and --disable parameters to the top-level Makefile.PL
    work again.
 
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+
 Imager 1.000 - 28 Jul 2014
 ============
 
diff --git a/FT2/Changes b/FT2/Changes
index 7b1f9ba5..001f8825 100644
--- a/FT2/Changes
+++ b/FT2/Changes
@@ -1,3 +1,9 @@
+Imager-Font-FT2 0.93
+====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+
 Imager-Font-FT2 0.92
 ====================
 
diff --git a/FT2/FT2.pm b/FT2/FT2.pm
index 0c112a45..48969962 100644
--- a/FT2/FT2.pm
+++ b/FT2/FT2.pm
@@ -6,7 +6,7 @@ use vars qw($VERSION @ISA);
 @ISA = qw(Imager::Font);
 
 BEGIN {
-  $VERSION = "0.92";
+  $VERSION = "0.93";
 
   require XSLoader;
   XSLoader::load('Imager::Font::FT2', $VERSION);
diff --git a/FT2/inc/Devel/CheckLib.pm b/FT2/inc/Devel/CheckLib.pm
index 1cac79b7..df7c379d 100644
--- a/FT2/inc/Devel/CheckLib.pm
+++ b/FT2/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport
 
 package #
 Devel::CheckLib;
@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.93_001';
+$VERSION = '0.93_002';
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
diff --git a/GIF/Changes b/GIF/Changes
index bdd6cd83..68ccac29 100644
--- a/GIF/Changes
+++ b/GIF/Changes
@@ -4,6 +4,9 @@ Imager-File-GIF 0.89
  - don't leave a test file behind when probing for the 4.2.0 file
    version bug fails.
 
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+
 Imager-File-GIF 0.89
 ====================
 
diff --git a/GIF/inc/Devel/CheckLib.pm b/GIF/inc/Devel/CheckLib.pm
index 1cac79b7..df7c379d 100644
--- a/GIF/inc/Devel/CheckLib.pm
+++ b/GIF/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport
 
 package #
 Devel::CheckLib;
@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.93_001';
+$VERSION = '0.93_002';
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
diff --git a/JPEG/Changes b/JPEG/Changes
index 7c536e2b..08fddf42 100644
--- a/JPEG/Changes
+++ b/JPEG/Changes
@@ -1,3 +1,11 @@
+Imager-File-JPEG 0.90
+=====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+
+Imager-File-JPEG 0.89
+=====================
 
  - added the jpeg_optimize parameter for writing JPEG files.  This can
    significantly reduce file sizes, but uses more memory and time.
diff --git a/JPEG/JPEG.pm b/JPEG/JPEG.pm
index 97dd9cf9..97262115 100644
--- a/JPEG/JPEG.pm
+++ b/JPEG/JPEG.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.89";
+  $VERSION = "0.90";
 
   require XSLoader;
   XSLoader::load('Imager::File::JPEG', $VERSION);
diff --git a/JPEG/inc/Devel/CheckLib.pm b/JPEG/inc/Devel/CheckLib.pm
index 1cac79b7..df7c379d 100644
--- a/JPEG/inc/Devel/CheckLib.pm
+++ b/JPEG/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport
 
 package #
 Devel::CheckLib;
@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.93_001';
+$VERSION = '0.93_002';
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
diff --git a/PNG/Changes b/PNG/Changes
index 7685d1fe..30238086 100644
--- a/PNG/Changes
+++ b/PNG/Changes
@@ -1,3 +1,9 @@
+Imager-File-PNG 0.91
+====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+
 Imager-File-PNG 0.91
 ====================
 
diff --git a/PNG/PNG.pm b/PNG/PNG.pm
index 05670754..954e9641 100644
--- a/PNG/PNG.pm
+++ b/PNG/PNG.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.91";
+  $VERSION = "0.92";
 
   require XSLoader;
   XSLoader::load('Imager::File::PNG', $VERSION);
diff --git a/PNG/inc/Devel/CheckLib.pm b/PNG/inc/Devel/CheckLib.pm
index 1cac79b7..df7c379d 100644
--- a/PNG/inc/Devel/CheckLib.pm
+++ b/PNG/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport
 
 package #
 Devel::CheckLib;
@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.93_001';
+$VERSION = '0.93_002';
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
diff --git a/T1/Changes b/T1/Changes
index 25e2aead..14cdf0ee 100644
--- a/T1/Changes
+++ b/T1/Changes
@@ -1,3 +1,9 @@
+Imager::Font::T1 1.024
+======================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+
 Imager::Font::T1 1.023
 ======================
 
diff --git a/T1/T1.pm b/T1/T1.pm
index c03757d7..11ef74d5 100644
--- a/T1/T1.pm
+++ b/T1/T1.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA $VERSION);
 use Scalar::Util ();
 
 BEGIN {
-  $VERSION = "1.023";
+  $VERSION = "1.024";
 
   require XSLoader;
   XSLoader::load('Imager::Font::T1', $VERSION);
diff --git a/T1/inc/Devel/CheckLib.pm b/T1/inc/Devel/CheckLib.pm
index 1cac79b7..df7c379d 100644
--- a/T1/inc/Devel/CheckLib.pm
+++ b/T1/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport
 
 package #
 Devel::CheckLib;
@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.93_001';
+$VERSION = '0.93_002';
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
diff --git a/TIFF/Changes b/TIFF/Changes
index e42c78e5..e36e0092 100644
--- a/TIFF/Changes
+++ b/TIFF/Changes
@@ -1,3 +1,9 @@
+Imager-File-TIFF 0.89
+=====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+
 Imager-File-TIFF 0.88
 =====================
 
diff --git a/TIFF/TIFF.pm b/TIFF/TIFF.pm
index 204ebcc8..f31103a5 100644
--- a/TIFF/TIFF.pm
+++ b/TIFF/TIFF.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
-  $VERSION = "0.88";
+  $VERSION = "0.89";
 
   require XSLoader;
   XSLoader::load('Imager::File::TIFF', $VERSION);
diff --git a/TIFF/inc/Devel/CheckLib.pm b/TIFF/inc/Devel/CheckLib.pm
index 1cac79b7..df7c379d 100644
--- a/TIFF/inc/Devel/CheckLib.pm
+++ b/TIFF/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport
 
 package #
 Devel::CheckLib;
@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.93_001';
+$VERSION = '0.93_002';
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
diff --git a/W32/Changes b/W32/Changes
index cc81090b..c3c5e927 100644
--- a/W32/Changes
+++ b/W32/Changes
@@ -1,3 +1,9 @@
+Imager-Font-W32 0.89
+====================
+
+ - update the bundled/modified Devel::CheckLib to handle the gcc-4
+   symlink on Cygwin
+
 Imager-Font-W32 0.88
 ====================
 
diff --git a/W32/W32.pm b/W32/W32.pm
index 151a63c3..89feecea 100644
--- a/W32/W32.pm
+++ b/W32/W32.pm
@@ -5,7 +5,7 @@ use vars qw($VERSION @ISA);
 @ISA = qw(Imager::Font);
 
 BEGIN {
-  $VERSION = "0.88";
+  $VERSION = "0.89";
 
   require XSLoader;
   XSLoader::load('Imager::Font::W32', $VERSION);
diff --git a/W32/inc/Devel/CheckLib.pm b/W32/inc/Devel/CheckLib.pm
index 1cac79b7..df7c379d 100644
--- a/W32/inc/Devel/CheckLib.pm
+++ b/W32/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport
 
 package #
 Devel::CheckLib;
@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.93_001';
+$VERSION = '0.93_002';
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
diff --git a/inc/Devel/CheckLib.pm b/inc/Devel/CheckLib.pm
index 1cac79b7..df7c379d 100644
--- a/inc/Devel/CheckLib.pm
+++ b/inc/Devel/CheckLib.pm
@@ -1,6 +1,6 @@
 # $Id: CheckLib.pm,v 1.25 2008/10/27 12:16:23 drhyde Exp $
 # This is a modified version of Devel::CheckLib 0.93 including the patches from
-# RT issues 60176 and 61645
+# RT issues 60176 and 61645 and other changes I need to backport
 
 package #
 Devel::CheckLib;
@@ -8,7 +8,7 @@ Devel::CheckLib;
 use 5.00405; #postfix foreach
 use strict;
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.93_001';
+$VERSION = '0.93_002';
 use Config qw(%Config);
 use Text::ParseWords 'quotewords';
 
@@ -406,7 +406,11 @@ sub _findcc {
     my @cc = split(/\s+/, $Config{cc});
     return ( [ @cc, @ccflags ], \@ldflags ) if -x $cc[0];
     foreach my $path (@paths) {
-        my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+        my $compiler = File::Spec->catfile($path, $cc[0]) . ($^O eq 'cygwin' ? '' : $Config{_exe});
+        return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
+            if -x $compiler;
+        next if ! length $Config{_exe};
+        $compiler = File::Spec->catfile($path, $cc[0]);
         return ([ $compiler, @cc[1 .. $#cc], @ccflags ], \@ldflags)
             if -x $compiler;
     }
-- 
2.39.5