r46622 - in /branches/upstream/libalien-wxwidgets-perl/current: Changes META.yml inc/My/Build/Any_wx_config.pm inc/My/Build/MacOSX_wx_config.pm lib/Alien/wxWidgets.pm

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Sun Nov  1 02:32:01 2009
New Revision: 46622

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46622
Log:
[svn-upgrade] Integrating new upstream version, libalien-wxwidgets-perl (0.45+dfsg)

Modified:
    branches/upstream/libalien-wxwidgets-perl/current/Changes
    branches/upstream/libalien-wxwidgets-perl/current/META.yml
    branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm
    branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/MacOSX_wx_config.pm
    branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm

Modified: branches/upstream/libalien-wxwidgets-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/Changes?rev=46622&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/Changes (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/Changes Sun Nov  1 02:32:01 2009
@@ -1,4 +1,8 @@
 Revision history for Perl extension Alien::wxWidgets.
+
+0.45  Wed Oct 14 22:54:35 CEST 2009
+	- On Snow Leopard, abort wxWidgets build if Perl is 64 bit.
+	- On Snow Leopard, force wxWidgets build to be 32 bit.
 
 0.44  Sun Aug  9 12:56:05 CEST 2009
 	- Rename all command line options to avoid clashing with

Modified: branches/upstream/libalien-wxwidgets-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/META.yml?rev=46622&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/META.yml (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/META.yml Sun Nov  1 02:32:01 2009
@@ -1,6 +1,6 @@
 ---
 name: Alien-wxWidgets
-version: 0.44
+version: 0.45
 author:
   - 'Mattia Barbon <mbarbon at cpan.org>'
 abstract: 'building, finding and using wxWidgets binaries'
@@ -18,7 +18,7 @@
 provides:
   Alien::wxWidgets:
     file: lib/Alien/wxWidgets.pm
-    version: 0.44
+    version: 0.45
   Alien::wxWidgets::Utility:
     file: lib/Alien/wxWidgets/Utility.pm
 generated_by: Module::Build version 0.34

Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm?rev=46622&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Any_wx_config.pm Sun Nov  1 02:32:01 2009
@@ -203,6 +203,19 @@
 
 sub build_wxwidgets {
     my $self = shift;
+
+    my $extra_flags = '';
+
+    # on Snow Leopard, force wxWidgets 2.8.x builds to be 32-bit
+    if(    $Config{osname} =~ /darwin/
+         && `uname -r` =~ /^10\./
+         && `sysctl hw.cpu64bit_capable` =~ /^hw.cpu64bit_capable: 1/ ) {
+        print "Forcing wxWidgets build to 32 bit\n";
+        $extra_flags = join ' ', map { qq{$_="-arch i386"} }
+                                     qw(CFLAGS CXXFLAGS LDFLAGS
+                                        OBJCFLAGS OBJCXXFLAGS);
+    }
+
     my $prefix_dir = $self->_key;
     my $prefix = awx_install_arch_dir( $self, $prefix_dir );
     my $opengl = $self->notes( 'build_wx_opengl' );
@@ -217,7 +230,7 @@
     my $cmd = "echo exit | " . # for OS X 10.3...
               "sh ../configure --prefix=$prefix $args --$unicode-unicode"
             . " --$debug-debug --$monolithic-monolithic"
-            . " --$universal-universal_binary";
+            . " --$universal-universal_binary $extra_flags";
     my $old_dir = Cwd::cwd;
 
     chdir $dir;

Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/MacOSX_wx_config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/MacOSX_wx_config.pm?rev=46622&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/MacOSX_wx_config.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/MacOSX_wx_config.pm Sun Nov  1 02:32:01 2009
@@ -2,6 +2,8 @@
 
 use strict;
 use base qw(My::Build::Any_wx_config);
+
+use Config;
 
 sub awx_wx_config_data {
     my $self = shift;
@@ -37,4 +39,22 @@
 sub awx_build_toolkit { 'mac' }
 sub awx_dlext { 'dylib' }
 
+sub build_wxwidgets {
+    my( $self ) = @_;
+
+    # can't build wxWidgets 2.8.x with 64 bit Perl
+    if(    $Config{ptrsize} == 8
+        && $self->notes( 'build_data' )->{data}{version} =~ /^2.8/ ) {
+        print <<EOT;
+======================================================================
+Can't build wxWidgets 2.8.x to work with a 64-bit Perl, you will need
+to recompile your Perl as a 32-bit binary.
+======================================================================
+EOT
+        exit 1;
+    }
+
+    $self->SUPER::build_wxwidgets;
+}
+
 1;

Modified: branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm?rev=46622&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm Sun Nov  1 02:32:01 2009
@@ -43,7 +43,7 @@
                       instantiate   => 'config';
 
 our $AUTOLOAD;
-our $VERSION = '0.44';
+our $VERSION = '0.45';
 our %VALUES;
 our $dont_remap;