Rework how proper ABI flags are set on IRIX, using patch provided by

Georg Schwarz in PR pkg/25057:

- check for PKGSRC_COMPILER instead of USE_MIPSPRO:
  USE_MIPSPRO would imply the former, but not the other way around.
  That is, it's conceivable to have a system that has PKGSRC_COMPILER
  set (to mipspro), but not USE_MIPSPRO.

- Allow passing of -Duse64bitint if ABI == 64 even if the compiler is not
  mipspro.  (Note: we could test this on a non-IRIX 64bit platform by
  setting ABI to '64'.  I think that should work, too, but I can't test
  that right now.)

2 files changed, 23 insertions, 14 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index af9d0fcb4d0..de45117c588 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2004/04/23 17:25:28 tv Exp $
+# $NetBSD: Makefile,v 1.83 2004/05/05 03:14:33 jschauma Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
@@ -53,17 +53,22 @@ CONFIGURE_ARGS+=	-Dsiteprefix="${VIEWBASE}"
 CONFIGURE_ARGS+=	-Dinstallsiteman1dir="${VIEWBASE}/man/man1"
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
 
 MKPIC?=			yes
 
-.if ${OPSYS} == "IRIX" && defined(USE_MIPSPRO)
+.if !empty(PKGSRC_COMPILER:Mmipspro*)
 .  if ${ABI} == "32"
 CONFIGURE_ARGS+=        -Dcc='cc -n32'
 .  elif ${ABI} == "64"
-CONFIGURE_ARGS+=        -Dcc='cc -64' -Duse64bitint
+CONFIGURE_ARGS+=        -Dcc='cc -64'
 .  endif
 .endif
 
+.if ${OPSYS} == "IRIX" && ${ABI} == "64"
+CONFIGURE_ARGS+=	-Duse64bitint
+.endif
+
 # Nail down the needed libraries for each platform here to avoid hidden
 # dependencies.  If this isn't defined, then use the perl defaults for the
 # particular operating system.
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index e10e783116b..38778dec899 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2004/04/26 04:42:12 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2004/05/05 03:14:33 jschauma Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -99,16 +99,6 @@ CONFIGURE_ARGS+=	-Duseithreads
 
 MKPIC?=		yes
 
-.if ${OPSYS} == "IRIX" && defined(USE_MIPSPRO)
-.  if ${ABI} == "32"
-PERL5_CC=		${CC:T} -n32
-.  elif ${ABI} == "64"
-PERL5_CC=		${CC:T} -64
-CONFIGURE_ARGS+=	-Duse64bitint
-.  endif
-.else
-PERL5_CC=		${CC:T}
-.endif
 CONFIGURE_ARGS+=	-Dcc="${PERL5_CC}"
 MAKE_ENV+=		LANG=""
 
@@ -192,6 +182,20 @@ MKPIC=		no
 
 .include "../../mk/compiler.mk"
 
+.if !empty(PKGSRC_COMPILER:Mmipspro)
+.  if ${ABI} == "32"
+PERL5_CC=		${CC:T} -n32
+.  elif ${ABI} == "64"
+PERL5_CC=		${CC:T} -64
+.  endif
+.else
+PERL5_CC=		${CC:T}
+.endif
+
+.if ${OPSYS} == "IRIX" && ${ABI} == "64"
+CONFIGURE_ARGS+=	-Duse64bitint
+.endif
+
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
 .  if !empty(CC_VERSION:Mgcc*)
 .    if !defined(_GCC_IS_TOO_OLD)