r18558 - in /trunk/libalien-wxwidgets-perl/debian: changelog patches/recognize_g++_compiler.patch

[roberto at users.alioth.debian.org]

Author: roberto
Date: Sun Apr 13 03:34:59 2008
New Revision: 18558

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18558
Log:
More intelligent check for compiler name and version (Closes: #475776)

Modified:
    trunk/libalien-wxwidgets-perl/debian/changelog
    trunk/libalien-wxwidgets-perl/debian/patches/recognize_g++_compiler.patch

Modified: trunk/libalien-wxwidgets-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/debian/changelog?rev=18558&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/debian/changelog (original)
+++ trunk/libalien-wxwidgets-perl/debian/changelog Sun Apr 13 03:34:59 2008
@@ -1,3 +1,9 @@
+libalien-wxwidgets-perl (0.33-3) unstable; urgency=low
+
+  * More intelligent check for compiler name and version (Closes: #475776)
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 12 Apr 2008 23:31:47 -0400
+
 libalien-wxwidgets-perl (0.33-2) unstable; urgency=low
 
   * Make Alien::wxWidgets->config able to see g++ >= 4.3 (Closes: #474404)

Modified: trunk/libalien-wxwidgets-perl/debian/patches/recognize_g++_compiler.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/debian/patches/recognize_g%2B%2B_compiler.patch?rev=18558&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/debian/patches/recognize_g++_compiler.patch (original)
+++ trunk/libalien-wxwidgets-perl/debian/patches/recognize_g++_compiler.patch Sun Apr 13 03:34:59 2008
@@ -9,3 +9,34 @@
             || scalar( awx_capture( "$cc" ) =~ m/gcc/i );          # 2.95
  }
  
+@@ -184,7 +184,7 @@
+     # the key already identifies the configuration
+     return %args if $args{key};
+ 
+-    my $cc = $ENV{CXX} || $ENV{CC} || $Config{cc};
++    my $cc = $ENV{CXX} || $ENV{CC} || $Config{ccname};
+     my $kind = awx_compiler_kind( $cc );
+     my $version = awx_cc_abi_version( $cc );
+ 
+--- libalien-wxwidgets-perl.orig/inc/My/Build/Any_wx_config.pm
++++ libalien-wxwidgets-perl/inc/My/Build/Any_wx_config.pm
+@@ -183,7 +183,7 @@
+ 
+ sub _key {
+     my $self = shift;
+-    my $compiler = $ENV{CXX} || $Config{cc};
++    my $compiler = $ENV{CXX} || $Config{ccname};
+     my $key = $self->awx_get_name
+       ( toolkit          => $self->awx_build_toolkit,
+         version          => $self->_version_2_dec
+--- libalien-wxwidgets-perl.orig/inc/My/Build/Win32.pm
++++ libalien-wxwidgets-perl/inc/My/Build/Win32.pm
+@@ -204,7 +204,7 @@
+     return 'WinCE' if $INC{'Cross.pm'};
+ 
+     SWITCH: {
+-        local $_ = $Config{cc};
++        local $_ = $Config{ccname};
+ 
+         /^cl/i  and $package = 'Win32_MSVC'  and last SWITCH;
+         /^gcc/i and $package = 'Win32_MinGW' and last SWITCH;