diff options
| author | jschauma <jschauma> | 2004-05-05 03:14:33 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2004-05-05 03:14:33 +0000 |
| commit | da0be9a90dda9aaade216417552233f062dec71c (patch) | |
| tree | 5d1d26e8b0ce68a161d3b1fdd91bddd3a71eb743 /lang/perl5 | |
| parent | 1f7c2cb2c0d62ba5e18eaf2c2fedbde890322a44 (diff) | |
| download | pkgsrc-da0be9a90dda9aaade216417552233f062dec71c.tar.gz | |
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.)
Diffstat (limited to 'lang/perl5')
| -rw-r--r-- | lang/perl5/Makefile | 11 |
1 files changed, 8 insertions, 3 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. |