generalize AIX ccversion hack for re extension

Message-ID: <Pine.OSF.4.10.10010301634500.67363-100000@aspara.forte.com>

p4raw-id: //depot/perl@7495

diff --git a/MANIFEST b/MANIFEST
index 6447f6a..4ba0a86 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -423,6 +423,7 @@ ext/attrs/Makefile.PL       attrs extension makefile writer
 ext/attrs/attrs.pm     attrs extension Perl module
 ext/attrs/attrs.xs     attrs extension external subroutines
 ext/re/Makefile.PL     re extension makefile writer
+ext/re/hints/aix.pl    Hints for re for named architecture
 ext/re/hints/mpeix.pl  Hints for re for named architecture
 ext/re/re.pm           re extension Perl module
 ext/re/re.xs           re extension external subroutines

diff --git a/ext/re/Makefile.PL b/ext/re/Makefile.PL
index f337db1..b8d25bd 100644 (file)
--- a/ext/re/Makefile.PL
+++ b/ext/re/Makefile.PL
@@ -4,10 +4,6 @@ use Config;
 
 my $object = 're_exec$(OBJ_EXT) re_comp$(OBJ_EXT) re$(OBJ_EXT)';
 
-if ($^O eq 'aix' && defined($Config{'ccversion'}) && $Config{'ccversion'} eq '3.6.6.0') {
-    $object .= ' ../../deb$(OBJ_EXT)';
-}
-
 WriteMakefile(
     NAME               => 're',
     VERSION_FROM       => 're.pm',

diff --git a/ext/re/hints/aix.pl b/ext/re/hints/aix.pl
new file mode 100644 (file)
index 0000000..35e04d7
--- /dev/null
+++ b/ext/re/hints/aix.pl
@@ -0,0 +1,16 @@
+# Add explicit link to deb.o to pick up .Perl_deb symbol which is not
+# mentioned in perl.exp for earlier cc (xlc) versions in at least
+# non DEBUGGING builds
+#  Peter Prymmer <pvhp@best.com>
+
+use Config;
+
+if ($^O eq 'aix' && defined($Config{'ccversion'}) && 
+       $Config{'ccversion'} =~ /^3\.\d/ # needed for at least these versions:
+                                        # $Config{'ccversion'} eq '3.6.6.0' 
+                                        # $Config{'ccversion'} eq '3.6.4.0' 
+                                        # $Config{'ccversion'} eq '3.1.3.3' 
+    ) {
+    $self->{OBJECT} .= ' ../../deb$(OBJ_EXT)';
+}
+