Subject: Re: cleaning up compiler.mk
To: None <tech-pkg@NetBSD.org, jmmv@NetBSD.org, grant@NetBSD.org>
From: Thomas Klausner <wiz@NetBSD.org>
List: tech-pkg
Date: 07/03/2004 16:00:24
--SLDf9lqlvOQaIe6s
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Sat, Jul 03, 2004 at 03:50:06PM +0200, Thomas Klausner wrote:
> USE_GCC3:
> lang/perl5 (unsets it)
Actually, it hacks around using gcc on AIX.
How about the attached diff instead?
> pkgtools/pkg_comp (references it)
Actually, it's using its own variable, so this one
can stay.
Thomas
--SLDf9lqlvOQaIe6s
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=perl-diff
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/perl5/Makefile,v
retrieving revision 1.83
diff -u -r1.83 Makefile
--- Makefile 5 May 2004 03:14:33 -0000 1.83
+++ Makefile 3 Jul 2004 13:57:57 -0000
@@ -213,11 +213,5 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/mk
${INSTALL_DATA} ${WRKDIR}/bsd.perl.mk ${PREFIX}/share/mk/bsd.perl.mk
-.if ${OPSYS} == "AIX"
-# Perl doesn't like building with gcc on AIX
-CC=/usr/bin/cc
-.undef USE_GCC3
-.endif
-
.include "module.mk"
.include "../../mk/bsd.pkg.mk"
Index: module.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/perl5/module.mk,v
retrieving revision 1.35
diff -u -r1.35 module.mk
--- module.mk 9 Jun 2004 17:53:04 -0000 1.35
+++ module.mk 3 Jul 2004 13:57:58 -0000
@@ -51,11 +51,12 @@
#
MAKE_PARAMS+= INSTALLDIRS=site
+.include "../../mk/compiler.mk"
+
.if ${OPSYS} == "AIX"
-# Perl doesn't like building with gcc on AIX
-CC=/usr/bin/cc
-MAKE_PARAMS+= CC="${CC}"
-.undef USE_GCC3
+.if !empty(CC_VERSION:Mgcc*)
+BROKEN= Perl does not like building with gcc on AIX, please use a different compiler
+.endif
.endif
MAKE_ENV+= LC_ALL=C
--SLDf9lqlvOQaIe6s--